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

Commit 6a5e9a21 authored by Jeongik Cha's avatar Jeongik Cha
Browse files

SYSTEM_EXT supports executables 

Because TARGET_OUT_SYSTEM_EXT_EXECUTABLES have been omitted, we cannot
install any executables in system_ext.
So fix it.

Test: set system_ext_specific true in some executable, and then check if
it is installed in /system_ext/bin
Bug: 139719550

Change-Id: I1bc7a2e6a7c25ec4b5b1ea6358ba8d3e1ae6331b
parent f51a70b0

core/envsetup.mk

+15 −1
Original line number Diff line number Diff line
@@ -817,7 +817,16 @@ TARGET_OUT_SYSTEM_EXT_JAVA_LIBRARIES:= $(TARGET_OUT_SYSTEM_EXT)/framework 
TARGET_OUT_SYSTEM_EXT_APPS := $(target_out_system_ext_app_base)/app

TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED := $(target_out_system_ext_app_base)/priv-app

TARGET_OUT_SYSTEM_EXT_ETC := $(TARGET_OUT_SYSTEM_EXT)/etc



TARGET_OUT_SYSTEM_EXT_EXECUTABLES := $(TARGET_OUT_SYSTEM_EXT)/bin

.KATI_READONLY := \

  TARGET_OUT_SYSTEM_EXT_EXECUTABLES \

  TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES \

  TARGET_OUT_SYSTEM_EXT_JAVA_LIBRARIES \

  TARGET_OUT_SYSTEM_EXT_APPS \

  TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED \

  TARGET_OUT_SYSTEM_EXT_ETC



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_EXECUTABLES := $(TARGET_OUT_SYSTEM_EXT_EXECUTABLES)

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES := $(target_out_system_ext_shared_libraries_base)/lib/$(TARGET_2ND_ARCH)

else
@@ -825,6 +834,11 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES := $(target_ 
endif

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_APPS := $(TARGET_OUT_SYSTEM_EXT_APPS)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED := $(TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED)

.KATI_READONLY := \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_EXECUTABLES \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_APPS \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED



TARGET_OUT_BREAKPAD := $(PRODUCT_OUT)/breakpad

.KATI_READONLY := TARGET_OUT_BREAKPAD