commit 17c6af46dff807b98740dc4bcc3142fedabe93f3
author Jiakai Zhang <jiakaiz@google.com> Wed Jul 12 16:54:56 2023 +0100
committer Jiakai Zhang <jiakaiz@google.com> Thu Jul 13 14:24:16 2023 +0100
tree 6b30b6d2371f90b06871a72215246cc6f1f54da0
parent 7a3ff6b30c236f746e3dde05775f68abaf961850

Add a Make variable that overrides configured jar locations.

Bug: 290583827
Test: m nothing
Change-Id: I9a23d6a033d50d2a8c5d9e8dd79d00033efa1f53

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index 8f4db38..cdda0d2 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -317,6 +317,10 @@
 _product_list_vars += PRODUCT_PACKAGE_NAME_OVERRIDES
 _product_list_vars += PRODUCT_CERTIFICATE_OVERRIDES
 
+# Overrides the (apex, jar) pairs above when determining the on-device location. The format is:
+# <old_apex>:<old_jar>:<new_apex>:<new_jar>
+_product_list_vars += PRODUCT_CONFIGURED_JAR_LOCATION_OVERRIDES
+
 # Controls for whether different partitions are built for the current product.
 _product_single_value_vars += PRODUCT_BUILD_SYSTEM_IMAGE
 _product_single_value_vars += PRODUCT_BUILD_SYSTEM_OTHER_IMAGE

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 0d5799c..88a210a 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -235,6 +235,7 @@
 $(call add_json_list, ManifestPackageNameOverrides,      $(PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES))
 $(call add_json_list, PackageNameOverrides,              $(PRODUCT_PACKAGE_NAME_OVERRIDES))
 $(call add_json_list, CertificateOverrides,              $(PRODUCT_CERTIFICATE_OVERRIDES))
+$(call add_json_list, ConfiguredJarLocationOverrides,    $(PRODUCT_CONFIGURED_JAR_LOCATION_OVERRIDES))
 
 $(call add_json_str, ApexGlobalMinSdkVersionOverride,    $(APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE))