diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-26 23:59:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-26 23:59:48 +0000 |
| commit | 6f88286f46949baea9d14af1d2fd8465ff47926a (patch) | |
| tree | 75b697d783810d2734e47de6b24d6cb3334e5c7e | |
| parent | 813b17dd5cf5e81c1bd36e7ffbab2d39844dcb36 (diff) | |
| parent | d65b625cc5952110f7347834fba0098e10119fcf (diff) | |
| download | build-6f88286f46949baea9d14af1d2fd8465ff47926a.tar.gz | |
Merge "Allow installing fake [odm|product|system_ext] packages" into main
| -rw-r--r-- | core/envsetup.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 30a6c0679f..7f9cbad0d8 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -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 |