From 976a52c007994890a353440902ea0449b9b5ab01 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 3 Oct 2023 12:58:27 -0700 Subject: [PATCH] Allow installing fake vendor packages This line in base_rules.mk requires a variable that's qualified by target/host, the partition, and the module class. There didn't exist one for target/vendor/fake, so fake vendor modules failed to compile. Add a TARGET_OUT_FAKE so we can use fake vendor modules. This is aimed at using install_symlink on the vendor partition. https://cs.android.com/android/platform/superproject/main/+/main:build/make/core/base_rules.mk;l=279;drc=c67e769b8c44eeb9bb851f20003b63d35193e155 Bug: 205632228 Test: presubmits Change-Id: If4618f90cebbafcd44e88e38513033282c37c1b7 --- core/envsetup.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index f5a2022cda..091c2e3050 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -720,6 +720,7 @@ TARGET_OUT_VENDOR_JAVA_LIBRARIES := $(TARGET_OUT_VENDOR)/framework TARGET_OUT_VENDOR_APPS := $(target_out_vendor_app_base)/app TARGET_OUT_VENDOR_APPS_PRIVILEGED := $(target_out_vendor_app_base)/priv-app TARGET_OUT_VENDOR_ETC := $(TARGET_OUT_VENDOR)/etc +TARGET_OUT_VENDOR_FAKE := $(PRODUCT_OUT)/vendor_fake_packages .KATI_READONLY := \ TARGET_OUT_VENDOR_EXECUTABLES \ TARGET_OUT_VENDOR_OPTIONAL_EXECUTABLES \ @@ -728,7 +729,8 @@ TARGET_OUT_VENDOR_ETC := $(TARGET_OUT_VENDOR)/etc TARGET_OUT_VENDOR_JAVA_LIBRARIES \ TARGET_OUT_VENDOR_APPS \ TARGET_OUT_VENDOR_APPS_PRIVILEGED \ - TARGET_OUT_VENDOR_ETC + TARGET_OUT_VENDOR_ETC \ + TARGET_OUT_VENDOR_FAKE $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_EXECUTABLES := $(TARGET_OUT_VENDOR_EXECUTABLES) $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(target_out_vendor_shared_libraries_base)/lib