commit 4d90da29a887f8919a0ad931d2045814e9e5ac65
author Jiakai Zhang <jiakaiz@google.com> Wed Jul 12 16:51:48 2023 +0100
committer Jiakai Zhang <jiakaiz@google.com> Fri Jul 14 12:13:30 2023 +0100
tree 0710e38e7ecadb233c8a3e0940c0667969224c32
parent cb13b5d1bde9a45316271c61fd23a22c35ebf609

Add a Make variable that overrides configured jar locations.

We had hardcoded logic to override "framework-minus-apex", but we need
to override more jars, so this CL adds a general solution for this.

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

android/variable.go

diff --git a/android/variable.go b/android/variable.go
index 3bec854..4442a09 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -401,9 +401,10 @@
 
 	WithDexpreopt bool `json:",omitempty"`
 
-	ManifestPackageNameOverrides []string `json:",omitempty"`
-	CertificateOverrides         []string `json:",omitempty"`
-	PackageNameOverrides         []string `json:",omitempty"`
+	ManifestPackageNameOverrides   []string `json:",omitempty"`
+	CertificateOverrides           []string `json:",omitempty"`
+	PackageNameOverrides           []string `json:",omitempty"`
+	ConfiguredJarLocationOverrides []string `json:",omitempty"`
 
 	ApexGlobalMinSdkVersionOverride *string `json:",omitempty"`