StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Use aapt2 flag --rename-resources-package in soong"" am: 4cb7fc05ae am: b64ac9a99f

Browse Source 
Change-Id: I1a5ae60c5d4f7a367635476bb6f39b8ca0bca9dd
This commit is contained in:
Treehugger Robot
2020-05-19 23:57:59 +00:00
committed by Automerger Merge Worker
parent 570b19e6dc b64ac9a99f
commit cb489ea826
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/app.go
View File

@@ -491,16 +491,6 @@ func (a *AndroidApp) shouldEmbedJnis(ctx android.BaseModuleContext) bool {
!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 @@ func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) {
if !overridden {
manifestPackageName = *a.overridableAppProperties.Package_name
}
aaptLinkFlags = append(aaptLinkFlags, generateAaptRenamePackageFlags(manifestPackageName)...)
aaptLinkFlags = append(aaptLinkFlags, "--rename-manifest-package "+manifestPackageName)
a.overriddenManifestPackageName = manifestPackageName
}