Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f15250ed authored by Ying Wang's avatar Ying Wang
Browse files

Set up oem.img directory structure for TARGET_2ND_ARCH. 

Change-Id: Ia931a10708225c428b658cb4a30e8bba66fa7308
parent 56eb2f98

core/envsetup.mk

+11 −3
Original line number Diff line number Diff line
@@ -323,12 +323,20 @@ $(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)),)

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_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