openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Add support for RRO in soong app prebuilts"

This commit is contained in:
Colin Cross 2017-12-01 22:05:42 +00:00 committed by Gerrit Code Review
parent fb46f47085 8c5ef24107
commit cd127ac860
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_HEADER_JAR :=
LOCAL_SOONG_DEX_JAR := LOCAL_SOONG_DEX_JAR :=
LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR := LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=
LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=
LOCAL_SOONG_RRO_DIRS :=
# '',true # '',true
LOCAL_SOURCE_FILES_ALL_GENERATED:= LOCAL_SOURCE_FILES_ALL_GENERATED:=
LOCAL_SRC_FILES:= LOCAL_SRC_FILES:=

10
core/soong_app_prebuilt.mk
View File

@ -64,5 +64,11 @@ my_common := COMMON
include $(BUILD_SYSTEM)/link_type.mk include $(BUILD_SYSTEM)/link_type.mk
endif # !LOCAL_IS_HOST_MODULE endif # !LOCAL_IS_HOST_MODULE
# Built in equivalent to include $(CLEAR_VARS) ifdef LOCAL_SOONG_RRO_DIRS
LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE := $(call append_enforce_rro_sources, \
$(my_register_name), \
false, \
$(LOCAL_FULL_MANIFEST_FILE), \
$(LOCAL_EXPORT_PACKAGE_RESOURCES), \
$(LOCAL_SOONG_RRO_DIRS))
endif