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

Add support for RRO in soong app prebuilts 

Let soong pass overlay directories that were not used because
of enforced RROs and use the make rules to convert them to
the auto generated RRO package.

Bug: 69917341
Test: m checkbuild
Change-Id: I9db37e0bf65c19cef91428477713e3d7f1941b83
This commit is contained in:
Colin Cross 2017-11-30 20:11:22 -08:00
parent 44e363f1e3
commit 8c5ef24107
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

@ -229,6 +229,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