summaryrefslogtreecommitdiffstats
path: root/core/envsetup.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-01-23 15:09:04 -0800
committerYing Wang <wangying@google.com>2014-01-23 15:12:51 -0800
commite3d067926f8b1a39ae1d9ee1f4eca2a5429e27b4 (patch)
tree12d08c9eb9a2c8fdcff1f94c54498394e55b2524 /core/envsetup.mk
parent83257fb3041677013d1b988475a2740f5be34ee9 (diff)
downloadbuild-e3d067926f8b1a39ae1d9ee1f4eca2a5429e27b4.zip
build-e3d067926f8b1a39ae1d9ee1f4eca2a5429e27b4.tar.gz
build-e3d067926f8b1a39ae1d9ee1f4eca2a5429e27b4.tar.bz2
Support arch-specific LOCAL_ variables
With those variables, you can set up different values for TARGET_ARCH and TARGET_2ND_ARCH. Also fixed a couple of variables. Bug: 11654773 Change-Id: I4c7684a562cd5877d18f67d4f848b8df07d0103b
Diffstat (limited to 'core/envsetup.mk')
-rw-r--r--core/envsetup.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk
index af2f952..63f27b9 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -252,6 +252,9 @@ TARGET_OUT_DATA_ETC := $(TARGET_OUT_ETC)
TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest
TARGET_OUT_DATA_FAKE := $(TARGET_OUT_DATA)/fake_packages
+$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_EXECUTABLES := $(TARGET_OUT_DATA_EXECUTABLES)
+$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_SHARED_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES)
+
TARGET_OUT_CACHE := $(PRODUCT_OUT)/cache
TARGET_OUT_VENDOR := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)
@@ -266,6 +269,7 @@ 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_EXECUTABLES := $(TARGET_OUT_VENDOR_EXECUTABLES)
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(TARGET_OUT_VENDOR)/lib
TARGET_OUT_UNSTRIPPED := $(PRODUCT_OUT)/symbols