diff options
| author | Ying Wang <wangying@google.com> | 2014-01-16 12:36:34 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-01-24 13:35:30 -0800 |
| commit | 4d2cc665eafb16ffe20b4ec8b2b2fc3a55f6f6ae (patch) | |
| tree | 6634db5eaa47f605d43d106db5201a122440f8a4 /core/dynamic_binary.mk | |
| parent | 6ef6519170742bf3d56e17d04194e9cb0ecdead7 (diff) | |
| download | build-4d2cc665eafb16ffe20b4ec8b2b2fc3a55f6f6ae.zip build-4d2cc665eafb16ffe20b4ec8b2b2fc3a55f6f6ae.tar.gz build-4d2cc665eafb16ffe20b4ec8b2b2fc3a55f6f6ae.tar.bz2 | |
Set up rules to build shared libraries for TARGET_2ND_ARCH
The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.
Bug: 11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
Diffstat (limited to 'core/dynamic_binary.mk')
| -rw-r--r-- | core/dynamic_binary.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index cd08690..38dd0c9 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -31,7 +31,7 @@ endif # 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) +guessed_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 @@ -52,6 +52,8 @@ LOCAL_INTERMEDIATE_TARGETS := $(linked_module) include $(BUILD_SYSTEM)/binary.mk ################################### +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_2ND_ARCH_VAR_PREFIX := $(LOCAL_2ND_ARCH_VAR_PREFIX) + # 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)) |