diff options
| author | Ying Wang <wangying@google.com> | 2014-12-18 14:53:52 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-12-18 15:13:04 -0800 |
| commit | 98ae79853509bbc1b6ee66ace10295c5d29510c5 (patch) | |
| tree | 6b1573625cdc9cf9cd8054b76b7f898df46b7507 /core/dynamic_binary.mk | |
| parent | 2902d4585f2a60a91084e96d00f2ee8d8301bf65 (diff) | |
| download | build-98ae79853509bbc1b6ee66ace10295c5d29510c5.zip build-98ae79853509bbc1b6ee66ace10295c5d29510c5.tar.gz build-98ae79853509bbc1b6ee66ace10295c5d29510c5.tar.bz2 | |
Fix using variable intermediates.COMMON before defining.
In commit e9dd9f2bf we moved "include $(BUILD_SYSTEM)/android_manifest.mk"
forward before the variable intermediates.COMMON gets defined. That's a
mistake.
This change replaced the tentative variables
package_expected_intermediates_COMMON and guessed_intermediates with
their proper counterparts defined in base_rules.mk.
If their values differ in the two file, that's an error and we should
fix.
Bug: 18168693
Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53
Diffstat (limited to 'core/dynamic_binary.mk')
| -rw-r--r-- | core/dynamic_binary.mk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index 3d6ad4a..08fb176 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -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 ########################################################### |