Revert "Use aapt2 flag --rename-resources-package in soong"
Revert "Remove hardcoding of permission controller package"
Revert "Use permissionController name rather than hardcode"
Revert submission 11618534-rename-resources
Reason for revert: Possible cause of ~20 test failues, see b/158441669
Reverted Changes:
I5b5b6699f:Use permissionController name rather than hardcode...
I47105cb3a:Remove hardcoding of permission controller package...
I70a43c216:Use aapt2 flag --rename-resources-package in soong...
I60c7f60e9:Use overriden id for resource getIdentifier
Ie8e1c7a9e:Remove resource getIdentifier workaround
Change-Id: I8d2aeff48cd2a3913b262f411c0613d5d61296af
diff --git a/java/app.go b/java/app.go
index c1396a6..3969b82 100755
--- a/java/app.go
+++ b/java/app.go
@@ -494,14 +494,6 @@
!a.IsForPlatform() || a.appProperties.AlwaysPackageNativeLibs
}
-func generateAaptRenamePackageFlags(packageName string) []string {
- aaptFlags := []string{}
- aaptFlags = append(aaptFlags, "--rename-manifest-package "+packageName)
- // Required to rename the package name in the resources table.
- aaptFlags = append(aaptFlags, "--rename-resources-package "+packageName)
- return aaptFlags
-}
-
func (a *AndroidApp) OverriddenManifestPackageName() string {
return a.overriddenManifestPackageName
}
@@ -538,7 +530,7 @@
if !overridden {
manifestPackageName = *a.overridableAppProperties.Package_name
}
- aaptLinkFlags = append(aaptLinkFlags, generateAaptRenamePackageFlags(manifestPackageName)...)
+ aaptLinkFlags = append(aaptLinkFlags, "--rename-manifest-package "+manifestPackageName)
a.overriddenManifestPackageName = manifestPackageName
}
diff --git a/java/app_test.go b/java/app_test.go
index 1a86e02..956cbab 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -1748,7 +1748,7 @@
certFlag string
lineageFlag string
overrides []string
- packageFlag string
+ aaptFlag string
logging_parent string
}{
{
@@ -1758,7 +1758,7 @@
certFlag: "build/make/target/product/security/expiredkey.x509.pem build/make/target/product/security/expiredkey.pk8",
lineageFlag: "",
overrides: []string{"qux"},
- packageFlag: "",
+ aaptFlag: "",
logging_parent: "",
},
{
@@ -1768,7 +1768,7 @@
certFlag: "cert/new_cert.x509.pem cert/new_cert.pk8",
lineageFlag: "--lineage lineage.bin",
overrides: []string{"qux", "foo"},
- packageFlag: "",
+ aaptFlag: "",
logging_parent: "bah",
},
{
@@ -1778,7 +1778,7 @@
certFlag: "build/make/target/product/security/expiredkey.x509.pem build/make/target/product/security/expiredkey.pk8",
lineageFlag: "",
overrides: []string{"qux", "foo"},
- packageFlag: "org.dandroid.bp",
+ aaptFlag: "--rename-manifest-package org.dandroid.bp",
logging_parent: "",
},
}
@@ -1826,11 +1826,12 @@
expected.logging_parent, logging_parent)
}
- // Check the package renaming flags, if exists.
+ // Check the package renaming flag, if exists.
res := variant.Output("package-res.apk")
aapt2Flags := res.Args["flags"]
- checkAapt2LinkFlag(t, aapt2Flags, "rename-manifest-package", expected.packageFlag)
- checkAapt2LinkFlag(t, aapt2Flags, "rename-resources-package", expected.packageFlag)
+ if !strings.Contains(aapt2Flags, expected.aaptFlag) {
+ t.Errorf("package renaming flag, %q is missing in aapt2 link flags, %q", expected.aaptFlag, aapt2Flags)
+ }
}
}
@@ -1967,7 +1968,6 @@
res := variant.Output("package-res.apk")
aapt2Flags := res.Args["flags"]
checkAapt2LinkFlag(t, aapt2Flags, "rename-manifest-package", expected.packageFlag)
- checkAapt2LinkFlag(t, aapt2Flags, "rename-resources-package", expected.packageFlag)
checkAapt2LinkFlag(t, aapt2Flags, "rename-instrumentation-target-package", expected.targetPackageFlag)
}
}
@@ -3180,7 +3180,6 @@
res := variant.Output("package-res.apk")
aapt2Flags := res.Args["flags"]
checkAapt2LinkFlag(t, aapt2Flags, "rename-manifest-package", expected.packageFlag)
- checkAapt2LinkFlag(t, aapt2Flags, "rename-resources-package", "")
checkAapt2LinkFlag(t, aapt2Flags, "rename-overlay-target-package", expected.targetPackageFlag)
}
}