bundle config contains (path,manifest) pairs of embedded APKs
If an APEX contains APKs and the manifest package name of the APKs are
overridden (either via override_android_app
orPRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES), that the path to the APK
(relative in the APEX) and the overridden manifest package name is
recorded in the bundle config file.
Exempt-From-Owner-Approval: cherry-pick from master
Bug: 148002117
Test: m
Merged-In: Ibb90bcefb77fa6b2dad77cb2facc6079de9ab154
(cherry picked from commit cfaa1643e8aea1a045655274757a62f936ca235b)
Change-Id: Ibb90bcefb77fa6b2dad77cb2facc6079de9ab154
diff --git a/java/app.go b/java/app.go
index bcf08a7..bfa25a2 100755
--- a/java/app.go
+++ b/java/app.go
@@ -147,6 +147,8 @@
additionalAaptFlags []string
noticeOutputs android.NoticeOutputs
+
+ overriddenManifestPackageName string
}
func (a *AndroidApp) IsInstallable() bool {
@@ -271,6 +273,10 @@
!a.IsForPlatform() || a.appProperties.AlwaysPackageNativeLibs
}
+func (a *AndroidApp) OverriddenManifestPackageName() string {
+ return a.overriddenManifestPackageName
+}
+
func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) {
a.aapt.usesNonSdkApis = Bool(a.Module.deviceProperties.Platform_apis)
@@ -304,6 +310,7 @@
manifestPackageName = *a.overridableAppProperties.Package_name
}
aaptLinkFlags = append(aaptLinkFlags, "--rename-manifest-package "+manifestPackageName)
+ a.overriddenManifestPackageName = manifestPackageName
}
aaptLinkFlags = append(aaptLinkFlags, a.additionalAaptFlags...)