commit cd127ac860c0aae22ec844b9eb43b409f344ff59
author Colin Cross <ccross@android.com> Fri Dec 01 22:05:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 01 22:05:42 2017 +0000
tree 6b41339bf4bdd7239b07189d3e3cdc16b67a364d
parent fb46f47085027a83333142ae5a0122a862e8b555
parent 8c5ef24107201624b89e24ae929dee5d73512f80

Merge "Add support for RRO in soong app prebuilts"

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 99bd691..1a96ebf 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -229,6 +229,8 @@
 LOCAL_SOONG_HEADER_JAR :=
 LOCAL_SOONG_DEX_JAR :=
 LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=
+LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=
+LOCAL_SOONG_RRO_DIRS :=
 # '',true
 LOCAL_SOURCE_FILES_ALL_GENERATED:=
 LOCAL_SRC_FILES:=

core/soong_app_prebuilt.mk

diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index ae0b982..0b8fa4d 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -64,5 +64,11 @@
 include $(BUILD_SYSTEM)/link_type.mk
 endif # !LOCAL_IS_HOST_MODULE
 
-# Built in equivalent to include $(CLEAR_VARS)
-LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=
+ifdef LOCAL_SOONG_RRO_DIRS
+  $(call append_enforce_rro_sources, \
+      $(my_register_name), \
+      false, \
+      $(LOCAL_FULL_MANIFEST_FILE), \
+      $(LOCAL_EXPORT_PACKAGE_RESOURCES), \
+      $(LOCAL_SOONG_RRO_DIRS))
+endif