commit a41f359854628ddd6e0dd8d773ad23f136c0e729
author Roberto Perez <robertoalexis@google.com> Mon Sep 30 16:20:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 30 16:20:57 2019 -0700
tree 8a17773f6124a02adb79d4ba006a1983aba213db
parent 1b33de2740ff11825f85fab725bc5749aa6f1f58
parent c7952345f7f9c3bb0a2cda09d641b6a684437976

Merge "Fix Chassis RRO generation" into pi-car-dev am: 00d0eb42d9
am: c7952345f7

Change-Id: I773a937473245b1966dd5ac35db28f4f130d109d

car-ui-lib/generate_rros.mk

diff --git a/car-ui-lib/generate_rros.mk b/car-ui-lib/generate_rros.mk
index 4e7931a..7e93c36 100644
--- a/car-ui-lib/generate_rros.mk
+++ b/car-ui-lib/generate_rros.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-# Generates one RRO for a given package
+# Generates one RRO for a given package.
 # $(1) target package name
 # $(2) name of the RRO set (e.g. "base")
 # $(3) resources folder
@@ -23,8 +23,8 @@
 
   rro_package_name := $(2)-$(subst .,-,$(1))
   LOCAL_RESOURCE_DIR := $(3)
+  LOCAL_RRO_THEME := $$(rro_package_name)
   LOCAL_PACKAGE_NAME := $$(rro_package_name)
-  LOCAL_PRODUCT_MODULE := true
   LOCAL_CERTIFICATE := platform
   LOCAL_SDK_VERSION := current