diff options
| author | Ying Wang <wangying@google.com> | 2015-03-14 00:31:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-14 00:31:44 +0000 |
| commit | d4ca3b38d9477cd8f163de75bff24cc97071f210 (patch) | |
| tree | fc001f9389a6c1efff6e235a314166399d019cd5 /core/envsetup.mk | |
| parent | 78c6a1cb1ad421d7c7e88eae3d5284a6a5daa552 (diff) | |
| parent | 4cbc4b392da57c34626af38a4ea0fe4dc115af57 (diff) | |
| download | build-d4ca3b38d9477cd8f163de75bff24cc97071f210.zip build-d4ca3b38d9477cd8f163de75bff24cc97071f210.tar.gz build-d4ca3b38d9477cd8f163de75bff24cc97071f210.tar.bz2 | |
am 4cbc4b39: am ae61f50a: Support to configure and build multiple custom images.
* commit '4cbc4b392da57c34626af38a4ea0fe4dc115af57':
Support to configure and build multiple custom images.
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 43774ea..3dfcfd6 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -107,6 +107,7 @@ endif TARGET_COPY_OUT_SYSTEM := system TARGET_COPY_OUT_DATA := data TARGET_COPY_OUT_OEM := oem +TARGET_COPY_OUT_ODM := odm TARGET_COPY_OUT_ROOT := root TARGET_COPY_OUT_RECOVERY := recovery ########################################### @@ -341,7 +342,7 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_APPS := $(TARGET_OUT_VENDOR_APPS) TARGET_OUT_OEM := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_OEM) TARGET_OUT_OEM_EXECUTABLES := $(TARGET_OUT_OEM)/bin -ifneq ($(filter %64,$(TARGET_ARCH)),) +ifeq ($(TARGET_IS_64_BIT),true) TARGET_OUT_OEM_SHARED_LIBRARIES := $(TARGET_OUT_OEM)/lib64 else TARGET_OUT_OEM_SHARED_LIBRARIES := $(TARGET_OUT_OEM)/lib @@ -355,6 +356,20 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_EXECUTABLES := $(TARGET_OUT_OEM_EXEC $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_SHARED_LIBRARIES := $(TARGET_OUT_OEM)/lib $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_APPS := $(TARGET_OUT_OEM_APPS) +TARGET_OUT_ODM := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ODM) +TARGET_OUT_ODM_EXECUTABLES := $(TARGET_OUT_ODM)/bin +ifeq ($(TARGET_IS_64_BIT),true) +TARGET_OUT_ODM_SHARED_LIBRARIES := $(TARGET_OUT_ODM)/lib64 +else +TARGET_OUT_ODM_SHARED_LIBRARIES := $(TARGET_OUT_ODM)/lib +endif +TARGET_OUT_ODM_APPS := $(TARGET_OUT_ODM)/app +TARGET_OUT_ODM_ETC := $(TARGET_OUT_ODM)/etc + +$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_EXECUTABLES := $(TARGET_OUT_ODM_EXECUTABLES) +$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES := $(TARGET_OUT_ODM)/lib +$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS := $(TARGET_OUT_ODM_APPS) + 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 |