summaryrefslogtreecommitdiffstats
path: root/core/static_library.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-01-17 16:17:28 -0800
committerYing Wang <wangying@google.com>2014-01-24 13:36:30 -0800
commitdd814bf8c20c4bbc641cc7cb71685c53e92977e1 (patch)
tree7a5e727509fb7f630ef17e895e6232c9c79b61c5 /core/static_library.mk
parentec6d6262acfc431abc3315b9ced28aa981416fdf (diff)
downloadbuild-dd814bf8c20c4bbc641cc7cb71685c53e92977e1.zip
build-dd814bf8c20c4bbc641cc7cb71685c53e92977e1.tar.gz
build-dd814bf8c20c4bbc641cc7cb71685c53e92977e1.tar.bz2
Support to build executables for TARGET_2ND_ARCH
By default, an executable is built for TARGET_ARCH. To build it for TARGET_2ND_ARCH in a 64bit product, use: LOCAL_32BIT_ONLY := true To skip a module for TARGET_2ND_ARCH, use: LOCAL_NO_2ND_ARCH := true Bug: 11654773 Change-Id: Ieb293d25b21024bfe1b554044df338e064ac7b46
Diffstat (limited to 'core/static_library.mk')
-rw-r--r--core/static_library.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/core/static_library.mk b/core/static_library.mk
index 2313553..747db81 100644
--- a/core/static_library.mk
+++ b/core/static_library.mk
@@ -1,7 +1,12 @@
+ifneq ($(TARGET_IS_64_BIT)|$(LOCAL_32BIT_ONLY),true|true)
+# Build for TARGET_ARCH
+LOCAL_2ND_ARCH_VAR_PREFIX :=
include $(BUILD_SYSTEM)/static_library_internal.mk
+endif
ifdef TARGET_2ND_ARCH
-
+ifneq ($(LOCAL_NO_2ND_ARCH),true)
+# Build for TARGET_2ND_ARCH
OVERRIDE_BUILT_MODULE_PATH :=
LOCAL_BUILT_MODULE :=
LOCAL_INSTALLED_MODULE :=
@@ -14,4 +19,5 @@ LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)
include $(BUILD_SYSTEM)/static_library_internal.mk
LOCAL_2ND_ARCH_VAR_PREFIX :=
-endif
+endif # LOCAL_NO_2ND_ARCH
+endif # TARGET_2ND_ARCH