Merge "NO_STANDARD_LIBRARIES := true blocks ALL resource libraries" (dc6e8223) · Commits · e / os / android_build

core/package_internal.mk

+6 −6

Original line number	Diff line number	Diff line
		@@ -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)