Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5432b7a authored by changho.shin's avatar changho.shin Committed by Changho Shin
Browse files

Add 'Additional_manifest' property to merge other manifests 

This is equivalent to 'LOCAL_FULL_LIBS_MANIFEST_FILES' in Make.

Fixes: 123374442
Test: m -j
Change-Id: Ic4b40a08f2454687c74949020598651acea3b2dd
parent 02ed5df4

androidmk/cmd/androidmk/android.go

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ func init() { 
			// Jacoco filters:

			"LOCAL_JACK_COVERAGE_INCLUDE_FILTER": "jacoco.include_filter",

			"LOCAL_JACK_COVERAGE_EXCLUDE_FILTER": "jacoco.exclude_filter",



			"LOCAL_FULL_LIBS_MANIFEST_FILES": "additional_manifests",

		})



	addStandardProperties(bpparser.BoolType,

java/aar.go

+8 −1
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ type aaptProperties struct { 


	// path to AndroidManifest.xml.  If unset, defaults to "AndroidManifest.xml".

	Manifest *string `android:"path"`



	// paths to additional manifest files to merge with main manifest.

	Additional_manifests []string `android:"path"`

}



type aapt struct {
@@ -220,7 +223,11 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex 
	a.transitiveManifestPaths = append(android.Paths{manifestPath}, transitiveStaticLibManifests...)



	if len(transitiveStaticLibManifests) > 0 {

		a.mergedManifestFile = manifestMerger(ctx, manifestPath, transitiveStaticLibManifests, a.isLibrary)

		// 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 !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