diff options
| author | Ying Wang <wangying@google.com> | 2014-01-23 15:09:04 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-01-24 13:38:34 -0800 |
| commit | b8e01854893f7390f23e6df82744b2bd3d0572c4 (patch) | |
| tree | 163ac6783685b010132e1ce3b6117f5ef6dbf0b3 /core/envsetup.mk | |
| parent | 5c7fed28f2c06e80182a08e36318d66e494a5a33 (diff) | |
| download | build-b8e01854893f7390f23e6df82744b2bd3d0572c4.zip build-b8e01854893f7390f23e6df82744b2bd3d0572c4.tar.gz build-b8e01854893f7390f23e6df82744b2bd3d0572c4.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
Conflicts:
core/base_rules.mk
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 2fba82d..fb524a4 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -251,6 +251,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) @@ -265,6 +268,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 |