diff options
| author | Ying Wang <wangying@google.com> | 2014-06-26 14:12:35 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-26 14:12:35 -0700 |
| commit | f15250ed86edd644c586bad28aac22c4ae6b7b71 (patch) | |
| tree | cce5b063374cddf3d59dc2154444b33c76160878 /core/envsetup.mk | |
| parent | 56eb2f983eecf1724674517d6d97046dcdeb3d88 (diff) | |
| download | build-f15250ed86edd644c586bad28aac22c4ae6b7b71.zip build-f15250ed86edd644c586bad28aac22c4ae6b7b71.tar.gz build-f15250ed86edd644c586bad28aac22c4ae6b7b71.tar.bz2 | |
Set up oem.img directory structure for TARGET_2ND_ARCH.
Change-Id: Ia931a10708225c428b658cb4a30e8bba66fa7308
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 974647e..7f77883 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -322,13 +322,21 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(TARGET_OUT_ $(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 -TARGET_OUT_OEM_SHARED_LIBRARIES:= $(TARGET_OUT_OEM)/lib +TARGET_OUT_OEM_EXECUTABLES := $(TARGET_OUT_OEM)/bin +ifneq ($(filter %64,$(TARGET_ARCH)),) +TARGET_OUT_OEM_SHARED_LIBRARIES := $(TARGET_OUT_OEM)/lib64 +else +TARGET_OUT_OEM_SHARED_LIBRARIES := $(TARGET_OUT_OEM)/lib +endif # We don't expect Java libraries in the oem.img. # TARGET_OUT_OEM_JAVA_LIBRARIES:= $(TARGET_OUT_OEM)/framework -TARGET_OUT_OEM_APPS:= $(TARGET_OUT_OEM)/app +TARGET_OUT_OEM_APPS := $(TARGET_OUT_OEM)/app TARGET_OUT_OEM_ETC := $(TARGET_OUT_OEM)/etc +$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_EXECUTABLES := $(TARGET_OUT_OEM_EXECUTABLES) +$(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_UNSTRIPPED := $(PRODUCT_OUT)/symbols TARGET_OUT_EXECUTABLES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/bin TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/lib |