p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add support for RRO in soong app prebuilts" am: cd127ac860 

am: 94b0dd3236

Change-Id: I80d1c91601fb03b8459e1378ba74c12aa1e7e4cd
This commit is contained in:
Colin Cross 2017-12-01 22:16:33 +00:00 committed by android-build-merger
parent d78a7ceb7f 94b0dd3236
commit ab47fd0947
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/clear_vars.mk
View File

@ -230,6 +230,8 @@ LOCAL_SHARED_LIBRARIES:=
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:=

10
core/soong_app_prebuilt.mk
View File

@ -64,5 +64,11 @@ my_common := COMMON
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