diff options
| author | Ying Wang <wangying@google.com> | 2014-01-16 12:36:34 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-01-16 15:43:47 -0800 |
| commit | 791fa6a9094dced42b4b292c163708838a8d059e (patch) | |
| tree | 58633ff001e2e5d57ec3efae0db7e563ec100bb5 /core/main.mk | |
| parent | ef204edd5b9f24c301c1dd415a90865f207d6359 (diff) | |
| download | build-791fa6a9094dced42b4b292c163708838a8d059e.zip build-791fa6a9094dced42b4b292c163708838a8d059e.tar.gz build-791fa6a9094dced42b4b292c163708838a8d059e.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/main.mk')
| -rw-r--r-- | core/main.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk index 8b6f444..7892782 100644 --- a/core/main.mk +++ b/core/main.mk @@ -608,6 +608,14 @@ $(foreach m,$(HOST_DEPENDENCIES_ON_SHARED_LIBRARIES), \ $(eval r := $(filter $(HOST_OUT_ROOT)/%,$(call module-installed-files,\ $(subst $(comma),$(space),$(lastword $(p)))))) \ $(eval $(call add-required-deps,$(word 2,$(p)),$(r)))) +ifdef TARGET_2ND_ARCH +$(foreach m,$($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES), \ + $(eval p := $(subst :,$(space),$(m))) \ + $(eval r := $(filter $(TARGET_OUT_ROOT)/%,$(call module-installed-files,\ + $(addsuffix $(TARGET_2ND_ARCH_MODULE_SUFFIX), \ + $(subst $(comma),$(space),$(lastword $(p))))))) \ + $(eval $(call add-required-deps,$(word 2,$(p)),$(r)))) +endif m := r := |