diff options
| author | Ying Wang <wangying@google.com> | 2014-05-20 14:43:51 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-20 18:03:21 -0700 |
| commit | 966c1e0cae6a59f15264d3b542af08e21e2dc06c (patch) | |
| tree | fc310007c15dd5de89d3fc7b3fe8eb6212039076 /core/dynamic_binary.mk | |
| parent | 4e151105a02ba09acb277c6a084252d01c561a5f (diff) | |
| download | build-966c1e0cae6a59f15264d3b542af08e21e2dc06c.zip build-966c1e0cae6a59f15264d3b542af08e21e2dc06c.tar.gz build-966c1e0cae6a59f15264d3b542af08e21e2dc06c.tar.bz2 | |
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
We already support pure 32-bit and 64-bit-by-default multilib build.
With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build.
This will be lest disruptive during the period we transition to
64-bit-by-default.
Bug: 13751317
Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722
Diffstat (limited to 'core/dynamic_binary.mk')
| -rw-r--r-- | core/dynamic_binary.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index e538d1e..396199c 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -26,7 +26,7 @@ guessed_intermediates := $(call local-intermediates-dir,,$(LOCAL_2ND_ARCH_VAR_PR # 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/$(LOCAL_BUILT_MODULE_STEM) +linked_module := $(guessed_intermediates)/LINKED/$(my_built_module_stem) ALL_ORIGINAL_DYNAMIC_BINARIES += $(linked_module) @@ -57,7 +57,7 @@ endif ifeq ($(LOCAL_COMPRESS_MODULE_SYMBOLS),true) $(error Symbol compression not yet supported.) -compress_output := $(intermediates)/COMPRESSED-$(LOCAL_BUILT_MODULE_STEM) +compress_output := $(intermediates)/COMPRESSED-$(my_built_module_stem) #TODO: write the real $(STRIPPER) rule. #TODO: define a rule to build TARGET_SYMBOL_FILTER_FILE, and @@ -79,7 +79,7 @@ else my_unstripped_path := $(LOCAL_UNSTRIPPED_PATH) endif symbolic_input := $(compress_output) -symbolic_output := $(my_unstripped_path)/$(LOCAL_INSTALLED_MODULE_STEM) +symbolic_output := $(my_unstripped_path)/$(my_installed_module_stem) $(symbolic_output) : $(symbolic_input) | $(ACP) @echo "target Symbolic: $(PRIVATE_MODULE) ($@)" $(copy-file-to-target) |