am aa4c8870: am a1e09b1a: am 98ae7985: Fix using variable intermediates.COMMON before defining. (92d6249f) · Commits · e / os / android_build

core/dynamic_binary.mk

+2 −10

Original line number	Diff line number	Diff line
		@@ -17,16 +17,13 @@ endif
		# know its results before base_rules.mk is included.
		include $(BUILD_SYSTEM)/configure_module_stem.mk

		# base_rules.make defines $(intermediates), but we need its value
		# before we include base_rules. Make a guess, and verify that
		# it's correct once the real value is defined.
		guessed_intermediates := $(call local-intermediates-dir,,$(LOCAL_2ND_ARCH_VAR_PREFIX))
		intermediates := $(call local-intermediates-dir,,$(LOCAL_2ND_ARCH_VAR_PREFIX))

		# Define the target that is the unmodified output of the linker.
		# The basename of this target must be the same as the final output
		# binary name, because it's used to set the "soname" in the binary.
		# The includer of this file will define a rule to build this target.
		linked_module := $(guessed_intermediates)/LINKED/$(my_built_module_stem)
		linked_module := $(intermediates)/LINKED/$(my_built_module_stem)

		ALL_ORIGINAL_DYNAMIC_BINARIES += $(linked_module)

		@@ -41,11 +38,6 @@ LOCAL_INTERMEDIATE_TARGETS := $(linked_module)
		include $(BUILD_SYSTEM)/binary.mk
		###################################

		# Make sure that our guess at the value of intermediates was correct.
		ifneq ($(intermediates),$(guessed_intermediates))
		$(error Internal error: guessed path '$(guessed_intermediates)' doesn't match '$(intermediates))
		endif

		###########################################################
		## Compress
		###########################################################

core/package_internal.mk

+4 −8

Original line number	Diff line number	Diff line
		@@ -123,7 +123,8 @@ endif

		all_res_assets := $(strip $(all_assets) $(all_resources))

		package_expected_intermediates_COMMON := $(call local-intermediates-dir,COMMON)
		intermediates.COMMON := $(call local-intermediates-dir,COMMON)

		# If no assets or resources were found, clear the directory variables so
		# we don't try to build them.
		ifneq (true,$(need_compile_asset))
		@@ -136,7 +137,7 @@ else
		# Make sure that R_file_stamp inherits the proper PRIVATE vars.
		# If R.stamp moves, be sure to update the framework makefile,
		# which has intimate knowledge of its location.
		R_file_stamp := $(package_expected_intermediates_COMMON)/src/R.stamp
		R_file_stamp := $(intermediates.COMMON)/src/R.stamp
		LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp)
		endif

		@@ -156,7 +157,7 @@ endif
		proguard_options_file :=
		ifneq ($(LOCAL_PROGUARD_ENABLED),custom)
		ifeq ($(need_compile_res),true)
		proguard_options_file := $(package_expected_intermediates_COMMON)/proguard_options
		proguard_options_file := $(intermediates.COMMON)/proguard_options
		endif # need_compile_res
		endif # !custom
		LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
		@@ -230,11 +231,6 @@ ifeq ($(need_compile_res),true)
		# At the same time, this will copy the R.java file to a central
		# 'R' directory to make it easier to add the files to an IDE.
		#
		#TODO: use PRIVATE_SOURCE_INTERMEDIATES_DIR instead of
		# $(intermediates.COMMON)/src
		ifneq ($(package_expected_intermediates_COMMON),$(intermediates.COMMON))
		$(error $(LOCAL_MODULE): internal error: expected intermediates.COMMON "$(package_expected_intermediates_COMMON)" != intermediates.COMMON "$(intermediates.COMMON)")
		endif

		$(R_file_stamp): PRIVATE_RESOURCE_PUBLICS_OUTPUT := \
		$(intermediates.COMMON)/public_resources.xml