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

Commit f62f4228 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Specify flags_packages property in the android_app-generated rro module 

Specify the `flags_packages` property in the rro module generated in the
android_app module factory. This property passes the information about
the state of the aconfig flags to aapt2, which enables flagging the
resources in the manifest files.

Test: Patch ag/29933298 && m framework-res
Bug: 374827009
Change-Id: I383c0050efaa160a6038133422eedb70545f1271
parent 6a9357d1

java/app.go

+2 −0
Original line number Diff line number Diff line
@@ -1340,12 +1340,14 @@ func AndroidAppFactory() android.Module { 
			Aaptflags      []string

			Manifest       *string

			Resource_dirs  []string

			Flags_packages []string

		}{

			Name:           proptools.StringPtr(rroPackageName),

			Filter_product: proptools.StringPtr(characteristics),

			Aaptflags:      []string{"--auto-add-overlay"},

			Manifest:       proptools.StringPtr(":" + rroManifestName),

			Resource_dirs:  a.aaptProperties.Resource_dirs,

			Flags_packages: a.aaptProperties.Flags_packages,

		}

		if !Bool(a.aaptProperties.Aapt_include_all_resources) {

			for _, aaptConfig := range ctx.Config().ProductAAPTConfig() {