Revert "Use aapt2 flag --rename-resources-package in soong"
This reverts commit 1674f9b4e957c38d6c4fd74c24e8698da860e19d.
Reason for revert: Breaks build
Change-Id: I465300eba68b62d65a0c0660b6bc283e4c89253b
diff --git a/java/app.go b/java/app.go
index 63c5bef..215b07b 100755
--- a/java/app.go
+++ b/java/app.go
@@ -491,16 +491,6 @@
!a.IsForPlatform() || a.appProperties.AlwaysPackageNativeLibs
}
-func generateAaptRenamePackageFlags(packageName string) []string {
- aaptFlags := []string{}
- aaptFlags = append(aaptFlags, "--rename-manifest-package "+packageName)
- // --rename-resources-package renames the package within the resources table to packageName.
- // Note: this will *not* rename the R.java file because the base module .R
- // package may be directly referenced in code.
- aaptFlags = append(aaptFlags, "--rename-resources-package "+packageName)
- return aaptFlags
-}
-
func (a *AndroidApp) OverriddenManifestPackageName() string {
return a.overriddenManifestPackageName
}
@@ -537,7 +527,7 @@
if !overridden {
manifestPackageName = *a.overridableAppProperties.Package_name
}
- aaptLinkFlags = append(aaptLinkFlags, generateAaptRenamePackageFlags(manifestPackageName)...)
+ aaptLinkFlags = append(aaptLinkFlags, "--rename-manifest-package "+manifestPackageName)
a.overriddenManifestPackageName = manifestPackageName
}