SHARE
TWEET

Untitled

a guest Sep 22nd, 2019 82 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/java/aar.go b/java/aar.go
  2. index 6b771b16f..cdf80a72e 100644
  3. --- a/java/aar.go
  4. +++ b/java/aar.go
  5. @@ -214,11 +214,12 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex
  6.     manifestPath := manifestFixer(ctx, manifestSrcPath, sdkContext,
  7.         a.isLibrary, a.uncompressedJNI, a.usesNonSdkApis, a.useEmbeddedDex)
  8.  
  9. +   // Merge additional manifest files with app manifest.
  10. +   additionalManifests := android.PathsForModuleSrc(ctx, a.aaptProperties.Additional_manifests)
  11.     a.transitiveManifestPaths = append(android.Paths{manifestPath}, transitiveStaticLibManifests...)
  12. +   a.transitiveManifestPaths = append(a.transitiveManifestPaths, additionalManifests...)
  13.  
  14.     if len(transitiveStaticLibManifests) > 0 {
  15. -       // Merge additional manifest files with app manifest.
  16. -       additionalManifests := android.PathsForModuleSrc(ctx, a.aaptProperties.Additional_manifests)
  17.         additionalManifests = append(additionalManifests, transitiveStaticLibManifests...)
  18.  
  19.         a.mergedManifestFile = manifestMerger(ctx, manifestPath, additionalManifests, a.isLibrary)
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!
 
Top