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

Merge "NO_STANDARD_LIBRARIES := true blocks ALL resource libraries" am: dc6e822374 

am: 02a9374e93

Change-Id: Icb4275ed1c3e6bb87a913025ca8ee1afd9046662
This commit is contained in:
Adam Lesinski 2018-02-16 03:52:48 +00:00 committed by android-build-merger
parent 92fc421d24 02a9374e93
commit fffec91ad7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/package_internal.mk
View File

@ -464,11 +464,10 @@ $(foreach x,$(sharded_java_source_list_files),$(eval $(x): $(R_file_stamp)))
endif # need_compile_res endif # need_compile_res
ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true) framework_res_package_export :=
# We need to explicitly clear this var so that we don't framework_res_package_export_deps :=
# inherit the value from whomever caused us to be built.
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_INCLUDES := ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
else
# Most packages should link against the resources defined by framework-res. # Most packages should link against the resources defined by framework-res.
# Even if they don't have their own resources, they may use framework # Even if they don't have their own resources, they may use framework
# resources. # resources.
@ -486,6 +485,8 @@ framework_res_package_export := \
framework_res_package_export_deps := \ framework_res_package_export_deps := \
$(dir $(framework_res_package_export))src/R.stamp $(dir $(framework_res_package_export))src/R.stamp
endif # LOCAL_SDK_RES_VERSION endif # LOCAL_SDK_RES_VERSION
endif # LOCAL_NO_STANDARD_LIBRARIES
all_library_res_package_exports := \ all_library_res_package_exports := \
$(framework_res_package_export) \ $(framework_res_package_export) \
$(foreach lib,$(LOCAL_RES_LIBRARIES),\ $(foreach lib,$(LOCAL_RES_LIBRARIES),\
@ -502,7 +503,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): \
ifdef LOCAL_USE_AAPT2 ifdef LOCAL_USE_AAPT2
$(my_res_package) : $(all_library_res_package_export_deps) $(my_res_package) : $(all_library_res_package_export_deps)
endif endif
endif # LOCAL_NO_STANDARD_LIBRARIES
ifneq ($(full_classes_jar),) ifneq ($(full_classes_jar),)
$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex) $(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)