Add override_module.
This new module type replaces the inherit-package function in make by
allowing developers to override the name, the certificate, and the
manifest package name of an android_app module.
Bug: 122957760
Fixes: 123640028
Test: app_test.go + BrowserGoogle
Change-Id: Iefe447e7078b25039233221361ef95c83a29973a
diff --git a/android/config.go b/android/config.go
index 24be10a..33986f7 100644
--- a/android/config.go
+++ b/android/config.go
@@ -895,16 +895,30 @@
}
func (c *deviceConfig) OverrideManifestPackageNameFor(name string) (manifestName string, overridden bool) {
+ if newManifestName, overridden := c.manifestPackageNameOverrides().Load(name); overridden {
+ return newManifestName.(string), true
+ }
return findOverrideValue(c.config.productVariables.ManifestPackageNameOverrides, name,
"invalid override rule %q in PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES should be <module_name>:<manifest_name>")
}
func (c *deviceConfig) OverrideCertificateFor(name string) (certificatePath string, overridden bool) {
- return findOverrideValue(c.config.productVariables.CertificateOverrides, name,
+ if newCert, overridden := c.certificateOverrides().Load(name); overridden {
+ return newCert.(string), true
+ }
+ newCert, overridden := findOverrideValue(c.config.productVariables.CertificateOverrides, name,
"invalid override rule %q in PRODUCT_CERTIFICATE_OVERRIDES should be <module_name>:<certificate_module_name>")
+ if overridden {
+ // PRODUCT_CERTIFICATE_OVERRIDES only supports cert modules.
+ newCert = ":" + newCert
+ }
+ return newCert, overridden
}
func (c *deviceConfig) OverridePackageNameFor(name string) string {
+ if newName, overridden := c.moduleNameOverrides().Load(name); overridden {
+ return newName.(string)
+ }
newName, overridden := findOverrideValue(
c.config.productVariables.PackageNameOverrides,
name,