diff options
| author | Jiyong Park <jiyong@google.com> | 2019-01-05 12:57:48 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-01-09 21:12:27 +0900 |
| commit | 7f67f48cbbd7a0c6079acb2d811ac85c47aaf356 (patch) | |
| tree | 60735919890713a6ed8f3575d160add161dc839c /java | |
| parent | e6092a5e489edc349eec71292219453d3d06d9ea (diff) | |
| download | android_build_soong-7f67f48cbbd7a0c6079acb2d811ac85c47aaf356.tar.gz android_build_soong-7f67f48cbbd7a0c6079acb2d811ac85c47aaf356.tar.bz2 android_build_soong-7f67f48cbbd7a0c6079acb2d811ac85c47aaf356.zip | |
Add PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES
It is a list of <module_name>:<manifest_name> pairs. When the module
name of an APK or an APEX matches with <module_name>, then its app
manifest name is overridden to <manifest_name>.
<module_name> and <manifest_name> can be patterns as in
com.android.%:com.mycompany.android.%.release
Note that, in case of APEXes, the manifest name refers to the name of
the zip container. The apex manifest name (which is specified in
apex_manifest.json) is not overridden.
Test: m with PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES for
1) an APK in Android.mk
2) an APK in ANdroid.bp
3) an APEX
and check that manifest names are modified as specified
Change-Id: Ie58882d90884695e893944c43d9c8803b283e93d
Diffstat (limited to 'java')
| -rw-r--r-- | java/app.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/app.go b/java/app.go index f99b2991..3b2305f6 100644 --- a/java/app.go +++ b/java/app.go @@ -184,6 +184,11 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { // TODO: LOCAL_PACKAGE_OVERRIDES // $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \ + manifestPackageName, overridden := ctx.DeviceConfig().OverrideManifestPackageNameFor(ctx.ModuleName()) + if overridden { + linkFlags = append(linkFlags, "--rename-manifest-package "+manifestPackageName) + } + a.aapt.buildActions(ctx, sdkContext(a), linkFlags...) // apps manifests are handled by aapt, don't let Module see them |