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

Commit 53554844 authored by Doheon Lee's avatar Doheon Lee Committed by android-build-merger
Browse files

Merge "Declare install path for product partition binaries" am: 39deff9e am: deb5a299 

am: ed9747c5

Change-Id: I1bf5f800392f2577fb4888673a5a5afcdc877c00
parents ca88f62d ed9747c5

core/envsetup.mk

+4 −0
Original line number Diff line number Diff line
@@ -833,6 +833,7 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS := $(TARGET_OUT_ODM_APPS) 
  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS



TARGET_OUT_PRODUCT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_PRODUCT)

TARGET_OUT_PRODUCT_EXECUTABLES := $(TARGET_OUT_PRODUCT)/bin

.KATI_READONLY := TARGET_OUT_PRODUCT

ifneq ($(filter address,$(SANITIZE_TARGET)),)

target_out_product_shared_libraries_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/product
@@ -858,12 +859,14 @@ TARGET_OUT_PRODUCT_APPS := $(target_out_product_app_base)/app 
TARGET_OUT_PRODUCT_APPS_PRIVILEGED := $(target_out_product_app_base)/priv-app

TARGET_OUT_PRODUCT_ETC := $(TARGET_OUT_PRODUCT)/etc

.KATI_READONLY := \

  TARGET_OUT_PRODUCT_EXECUTABLES \

  TARGET_OUT_PRODUCT_SHARED_LIBRARIES \

  TARGET_OUT_PRODUCT_JAVA_LIBRARIES \

  TARGET_OUT_PRODUCT_APPS \

  TARGET_OUT_PRODUCT_APPS_PRIVILEGED \

  TARGET_OUT_PRODUCT_ETC



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_EXECUTABLES := $(TARGET_OUT_PRODUCT_EXECUTABLES)

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SHARED_LIBRARIES := $(target_out_product_shared_libraries_base)/lib/$(TARGET_2ND_ARCH)

else
@@ -872,6 +875,7 @@ endif 
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_APPS := $(TARGET_OUT_PRODUCT_APPS)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_APPS_PRIVILEGED := $(TARGET_OUT_PRODUCT_APPS_PRIVILEGED)

.KATI_READONLY := \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_EXECUTABLES \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SHARED_LIBRARIES \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_APPS \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_APPS_PRIVILEGED