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

Commit e19d335c authored by Cole Faust's avatar Cole Faust
Browse files

Switch from genrule to java_genrule 

These genrules had java dependencies. java modules have os/arch
variants whereas regular genrules do not. The dependency worked because
of the "1-variant fallback" feature of song that we're trying to
remove to support incremental analysis. Switch to java_genrule so that
the variants of the genrule and its dependencies match.

Bug: 372091092
Test: m nothing
Change-Id: I928c1939db59ee59994cc1ed3a7410e0b2e1dd7a
parent 9be19cc8

java/app.go

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import ( 
	"android/soong/android"

	"android/soong/cc"

	"android/soong/dexpreopt"

	"android/soong/genrule"

	"android/soong/tradefed"

)
@@ -1333,7 +1332,7 @@ func AndroidAppFactory() android.Module { 
			Srcs:  []string{":" + a.Name() + "{.apk}"},

			Cmd:   proptools.StringPtr("$(location characteristics_rro_generator) $$($(location aapt2) dump packagename $(in)) $(out)"),

		}

		ctx.CreateModule(genrule.GenRuleFactory, &rroManifestProperties)

		ctx.CreateModule(GenRuleFactory, &rroManifestProperties)



		rroProperties := struct {

			Name           *string