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

Commit 45581048 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents d12bc882 ea73f271

core/envsetup.mk

+9 −3
Original line number Diff line number Diff line
@@ -789,6 +789,7 @@ TARGET_OUT_ODM_JAVA_LIBRARIES := $(TARGET_OUT_ODM)/framework 
TARGET_OUT_ODM_APPS := $(target_out_odm_app_base)/app

TARGET_OUT_ODM_APPS_PRIVILEGED := $(target_out_odm_app_base)/priv-app

TARGET_OUT_ODM_ETC := $(TARGET_OUT_ODM)/etc

TARGET_OUT_ODM_FAKE := $(PRODUCT_OUT)/odm_fake_packages

.KATI_READONLY := \

  TARGET_OUT_ODM \

  TARGET_OUT_ODM_EXECUTABLES \
@@ -798,7 +799,8 @@ TARGET_OUT_ODM_ETC := $(TARGET_OUT_ODM)/etc 
  TARGET_OUT_ODM_JAVA_LIBRARIES \

  TARGET_OUT_ODM_APPS \

  TARGET_OUT_ODM_APPS_PRIVILEGED \

  TARGET_OUT_ODM_ETC

  TARGET_OUT_ODM_ETC \

  TARGET_OUT_ODM_FAKE



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_EXECUTABLES := $(TARGET_OUT_ODM_EXECUTABLES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES := $(target_out_odm_shared_libraries_base)/lib
@@ -936,13 +938,15 @@ TARGET_OUT_PRODUCT_JAVA_LIBRARIES := $(TARGET_OUT_PRODUCT)/framework 
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

TARGET_OUT_PRODUCT_FAKE := $(TARGET_OUT_PRODUCT)/product_fake_packages

.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_OUT_PRODUCT_ETC \

  TARGET_OUT_PRODUCT_FAKE



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_EXECUTABLES := $(TARGET_OUT_PRODUCT_EXECUTABLES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SHARED_LIBRARIES := $(target_out_product_shared_libraries_base)/lib
@@ -979,13 +983,15 @@ 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

TARGET_OUT_SYSTEM_EXT_FAKE := $(PRODUCT_OUT)/system_ext_fake_packages

.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_OUT_SYSTEM_EXT_ETC \

  TARGET_OUT_SYSTEM_EXT_FAKE



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_EXECUTABLES := $(TARGET_OUT_SYSTEM_EXT_EXECUTABLES)

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