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

Commit 09d9b906 authored by Doheon Lee's avatar Doheon Lee
Browse files

Declare install path for product partition binaries 

Build system will install binaries to product partition path when build
scripts specify module's install path to product partition.
To supports that, TARGET_OUT_PRODUCT_EXECUTABLES for primary and
secondary ABI path should be declared.

Bug: 110745956
Test: Set LOCAL_PRODUCT_MODULE to true in Android.mk or set product to
true in Android.bp file.

Change-Id: Ib8a491364ee30e49bb327163974661915e183608
parent 674454f2

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