commit cc41430a8bd45d6f33fcecef44fe3461803e2ffe
author Anton Hansson <hansson@google.com> Wed Jan 30 14:49:46 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 30 14:49:46 2019 -0800
tree fe5c34664f260e1b3fd134a920b409702771f5d3
parent 495c981604afd2bc0394803d7c1a09f192e791b9
parent 65adcb9e7f779f9a6fe9d097768c9fd0f6170b32

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

Change-Id: Iffcf21cec34011e5ae971198157d57a6e78c95e4

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