commit 00d0eb42d912d55d9740853cca3995b11bb6c46d
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Sep 30 23:05:53 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 30 23:05:53 2019 +0000
tree ae3c531d4bc42805a2aec6096613431add9e170c
parent bd6f8b1101dcccc3d36c11ecffeca5de2d076251
parent ceabe60b8c524f9b2d1d35e2d8248c18f534c788

Merge "Fix Chassis RRO generation" into pi-car-dev

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