Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/java/aar.go b/java/aar.go
- index 6b771b16f..cdf80a72e 100644
- --- a/java/aar.go
- +++ b/java/aar.go
- @@ -214,11 +214,12 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex
- manifestPath := manifestFixer(ctx, manifestSrcPath, sdkContext,
- a.isLibrary, a.uncompressedJNI, a.usesNonSdkApis, a.useEmbeddedDex)
- + // Merge additional manifest files with app manifest.
- + additionalManifests := android.PathsForModuleSrc(ctx, a.aaptProperties.Additional_manifests)
- a.transitiveManifestPaths = append(android.Paths{manifestPath}, transitiveStaticLibManifests...)
- + a.transitiveManifestPaths = append(a.transitiveManifestPaths, additionalManifests...)
- 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)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement