From 09d9b90625f69afa762c21aaaa5d95cb4378790d Mon Sep 17 00:00:00 2001 From: Doheon Lee Date: Mon, 25 Jun 2018 10:56:01 +0900 Subject: [PATCH] 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 --- core/envsetup.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/envsetup.mk b/core/envsetup.mk index 874ea916c6..2f37767684 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -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