Allow each APEX to provide its own AndroidManifest am: 40e26a2a99 (a49e4400) · Commits · e / os / android_build_soong

apex/apex.go

+10 −0

Original line number	Diff line number	Diff line
		@@ -212,6 +212,10 @@ type apexBundleProperties struct {
		// "apex_manifest.json"
		Manifest *string

		// AndroidManifest.xml file used for the zip container of this APEX bundle.
		// If unspecified, a default one is automatically generated.
		AndroidManifest *string

		// Determines the file contexts file for setting security context to each file in this APEX bundle.
		// Specifically, when this is set to <value>, /system/sepolicy/apex/<value>_file_contexts file is
		// used.
		@@ -901,6 +905,12 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, keyFile and
		optFlags = append(optFlags, "--override_apk_package_name "+manifestPackageName)
		}

		if a.properties.AndroidManifest != nil {
		androidManifestFile := android.PathForModuleSrc(ctx, proptools.String(a.properties.AndroidManifest))
		implicitInputs = append(implicitInputs, androidManifestFile)
		optFlags = append(optFlags, "--android_manifest "+androidManifestFile.String())
		}

		ctx.Build(pctx, android.BuildParams{
		Rule: apexRule,
		Implicits: implicitInputs,