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
}