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
diff --git a/java/app.go b/java/app.go
index dd99675..e112e93 100644
--- a/java/app.go
+++ b/java/app.go
@@ -30,7 +30,6 @@
"android/soong/android"
"android/soong/cc"
"android/soong/dexpreopt"
- "android/soong/genrule"
"android/soong/tradefed"
)
@@ -1333,7 +1332,7 @@
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