diff options
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/java/aar.go b/java/aar.go index 6426ac365..afe860c1c 100644 --- a/java/aar.go +++ b/java/aar.go @@ -72,6 +72,9 @@ type aaptProperties struct { // paths to additional manifest files to merge with main manifest. Additional_manifests []string `android:"path"` + + // do not include AndroidManifest from dependent libraries + Dont_merge_manifests *bool } type aapt struct { @@ -225,7 +228,7 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex a.transitiveManifestPaths = append(android.Paths{manifestPath}, additionalManifests...) a.transitiveManifestPaths = append(a.transitiveManifestPaths, transitiveStaticLibManifests...) - if len(a.transitiveManifestPaths) > 1 { + if len(a.transitiveManifestPaths) > 1 && !Bool(a.aaptProperties.Dont_merge_manifests) { 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 @@ -535,6 +538,10 @@ func (a *AARImport) targetSdkVersion() string { return a.sdkVersion() } +func (a *AARImport) javaVersion() string { + return "" +} + var _ AndroidLibraryDependency = (*AARImport)(nil) func (a *AARImport) ExportPackage() android.Path { |