diff options
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2019-09-10 22:13:31 +0200 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2019-09-11 23:37:53 +0200 |
| commit | 268cafb648da8613290781b3d7fc9c62776cf5b2 (patch) | |
| tree | e35ee0ca5fc6c63dcc2bc9ec71fcd1b72c00626f | |
| parent | 3a52efe06472b1e4fcbbea3cd0c985b53e521a4d (diff) | |
| download | build_soong-268cafb648da8613290781b3d7fc9c62776cf5b2.tar.gz build_soong-268cafb648da8613290781b3d7fc9c62776cf5b2.tar.bz2 build_soong-268cafb648da8613290781b3d7fc9c62776cf5b2.zip | |
Make additional manifests transitive
Test: m, additional_manifests is now transitive
Change-Id: I3134c5e942959fe762024602fd833ec4a4312d2c
| -rw-r--r-- | java/aar.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/java/aar.go b/java/aar.go index d0d746c0..53d946f6 100644 --- a/java/aar.go +++ b/java/aar.go @@ -217,14 +217,13 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex manifestPath := manifestFixer(ctx, manifestSrcPath, sdkContext, a.isLibrary, a.uncompressedJNI, a.usesNonSdkApis, a.useEmbeddedDex) - a.transitiveManifestPaths = append(android.Paths{manifestPath}, transitiveStaticLibManifests...) + // Add additional manifest files to transitive manifests. + additionalManifests := android.PathsForModuleSrc(ctx, a.aaptProperties.Additional_manifests) + a.transitiveManifestPaths = append(android.Paths{manifestPath}, additionalManifests...) + a.transitiveManifestPaths = append(a.transitiveManifestPaths, transitiveStaticLibManifests...) - if len(transitiveStaticLibManifests) > 0 { - // Merge additional manifest files with app manifest. - additionalManifests := android.PathsForModuleSrc(ctx, a.aaptProperties.Additional_manifests) - additionalManifests = append(additionalManifests, transitiveStaticLibManifests...) - - a.mergedManifestFile = manifestMerger(ctx, manifestPath, additionalManifests, a.isLibrary) + if len(a.transitiveManifestPaths) > 1 { + a.mergedManifestFile = manifestMerger(ctx, a.transitiveManifestPaths[0], a.transitiveManifestPaths[1:], a.isLibrary) if !a.isLibrary { // Only use the merged manifest for applications. For libraries, the transitive closure of manifests // will be propagated to the final application and merged there. The merged manifest for libraries is |