From 6b6283a0421b600b31e63e3f600cceec06b3cc1d Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Wed, 14 Feb 2018 16:18:12 -0800 Subject: [PATCH] NO_STANDARD_LIBRARIES := true blocks ALL resource libraries LOCAL_RES_LIBRARIES and LOCAL_APK_LIBRARIES should still be honored. Test: make CtsDevicePrereleaseSdkApp Change-Id: I3360d0fe2f7e2f3038e48f41905923a72609ceec --- core/package_internal.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/package_internal.mk b/core/package_internal.mk index d7944bb0e..16c07a6dd 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -464,11 +464,10 @@ $(foreach x,$(sharded_java_source_list_files),$(eval $(x): $(R_file_stamp))) endif # need_compile_res -ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true) -# We need to explicitly clear this var so that we don't -# inherit the value from whomever caused us to be built. -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_INCLUDES := -else +framework_res_package_export := +framework_res_package_export_deps := + +ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) # Most packages should link against the resources defined by framework-res. # Even if they don't have their own resources, they may use framework # resources. @@ -486,6 +485,8 @@ framework_res_package_export := \ framework_res_package_export_deps := \ $(dir $(framework_res_package_export))src/R.stamp endif # LOCAL_SDK_RES_VERSION +endif # LOCAL_NO_STANDARD_LIBRARIES + all_library_res_package_exports := \ $(framework_res_package_export) \ $(foreach lib,$(LOCAL_RES_LIBRARIES),\ @@ -502,7 +503,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): \ ifdef LOCAL_USE_AAPT2 $(my_res_package) : $(all_library_res_package_export_deps) endif -endif # LOCAL_NO_STANDARD_LIBRARIES ifneq ($(full_classes_jar),) $(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)