summaryrefslogtreecommitdiffstats
path: root/core/envsetup.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-01-15 16:02:16 -0800
committerYing Wang <wangying@google.com>2014-01-24 13:35:09 -0800
commit6ef6519170742bf3d56e17d04194e9cb0ecdead7 (patch)
treeceaaa6c376228045a596bb7250b34155c56ef09a /core/envsetup.mk
parent1d274d26869bfe6881d503b2d24f87cc40cf2727 (diff)
downloadbuild-6ef6519170742bf3d56e17d04194e9cb0ecdead7.zip
build-6ef6519170742bf3d56e17d04194e9cb0ecdead7.tar.gz
build-6ef6519170742bf3d56e17d04194e9cb0ecdead7.tar.bz2
Set up rules to build static libraries for TARGET_2ND_ARCH
The rules for the 2nd arch are set up in the second inclusion of static_library_internal.mk. libfoo of the 2nd arch will be built into $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a. Bug: 11654773 Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
Diffstat (limited to 'core/envsetup.mk')
-rw-r--r--core/envsetup.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 99ec0cd..7926386 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -234,6 +234,7 @@ TARGET_OUT_FAKE := $(PRODUCT_OUT)/fake_packages
# Out for TARGET_2ND_ARCH
TARGET_2ND_ARCH_VAR_PREFIX := 2ND_
+TARGET_2ND_ARCH_MODULE_SUFFIX := _32
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES)/lib
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $(TARGET_OUT)/lib
@@ -263,6 +264,8 @@ TARGET_OUT_VENDOR_JAVA_LIBRARIES := $(TARGET_OUT_VENDOR)/framework
TARGET_OUT_VENDOR_APPS := $(TARGET_OUT_VENDOR)/app
TARGET_OUT_VENDOR_ETC := $(TARGET_OUT_VENDOR)/etc
+$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(TARGET_OUT_VENDOR)/lib
+
TARGET_OUT_UNSTRIPPED := $(PRODUCT_OUT)/symbols
TARGET_OUT_EXECUTABLES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/bin
TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/lib