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

Commit d8bab375 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Skip passing "--product default" to aapt2" into main

parents 9923e80b 10af6edc

java/app.go

+3 −2
Original line number Diff line number Diff line
@@ -472,8 +472,9 @@ func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) { 
	// Add TARGET_AAPT_CHARACTERISTICS values to AAPT link flags if they exist and --product flags were not provided.

	autogenerateRRO := proptools.Bool(a.appProperties.Generate_product_characteristics_rro)

	hasProduct := android.PrefixInList(a.aaptProperties.Aaptflags, "--product")

	if !autogenerateRRO && !hasProduct && len(ctx.Config().ProductAAPTCharacteristics()) > 0 {

		aaptLinkFlags = append(aaptLinkFlags, "--product", ctx.Config().ProductAAPTCharacteristics())

	characteristics := ctx.Config().ProductAAPTCharacteristics()

	if !autogenerateRRO && !hasProduct && len(characteristics) > 0 && characteristics != "default" {

		aaptLinkFlags = append(aaptLinkFlags, "--product", characteristics)

	}



	if !Bool(a.aaptProperties.Aapt_include_all_resources) {