commit 5729a4939a5d3952142aa761e524197290942a66
author Anton Hansson <hansson@google.com> Wed Jan 30 15:08:17 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 30 15:08:17 2019 -0800
tree 1db69e8c93812d4423b7039a0befc58a783b3b6b
parent 7226245928931ed30dde227d50bd2f8f0ba9af40
parent cc41430a8bd45d6f33fcecef44fe3461803e2ffe

Merge "Fix RRO when LOCAL_EXPORT_PACKAGE_RESOURCES is unset" am: bb83cc2689 am: 65adcb9e7f
am: cc41430a8b

Change-Id: I6d97ea941b1e4cd3a38df749c725dee2a0e3bd13

core/soong_app_prebuilt.mk

diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index 1e93cee..3d28ea7 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -162,7 +162,7 @@
       $(my_register_name), \
       false, \
       $(LOCAL_FULL_MANIFEST_FILE), \
-      $(LOCAL_EXPORT_PACKAGE_RESOURCES), \
+      $(if $(LOCAL_EXPORT_PACKAGE_RESOURCES),true,false), \
       $(LOCAL_SOONG_RRO_DIRS))
 endif