Add jetifier support in Soong.
This is a blocker for droiddoc targets migration under vendor/.
Test: N/A
Bug: b/72552006
Change-Id: If85a0917c1ac0d88b9d5b488216a638b4dabd39f
diff --git a/java/aar.go b/java/aar.go
index e6a412c..175e794 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -375,6 +375,9 @@
Static_libs []string
Libs []string
+
+ // if set to true, run Jetifier against .aar file. Defaults to false.
+ Jetifier_enabled *bool
}
type AARImport struct {
@@ -456,7 +459,14 @@
return
}
- aar := android.PathForModuleSrc(ctx, a.properties.Aars[0])
+ aarName := ctx.ModuleName() + ".aar"
+ var aar android.Path
+ aar = android.PathForModuleSrc(ctx, a.properties.Aars[0])
+ if Bool(a.properties.Jetifier_enabled) {
+ inputFile := aar
+ aar = android.PathForModuleOut(ctx, "jetifier", aarName)
+ TransformJetifier(ctx, aar.(android.WritablePath), inputFile)
+ }
extractedAARDir := android.PathForModuleOut(ctx, "aar")
extractedResDir := extractedAARDir.Join(ctx, "res")
diff --git a/java/builder.go b/java/builder.go
index 68fba86..c645ee2 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -121,6 +121,13 @@
CommandDeps: []string{"${config.JavaCmd}", "${config.JarjarCmd}", "$rulesFile"},
},
"rulesFile")
+
+ jetifier = pctx.AndroidStaticRule("jetifier",
+ blueprint.RuleParams{
+ Command: "${config.JavaCmd} -jar ${config.JetifierJar} -l error -o $out -i $in",
+ CommandDeps: []string{"${config.JavaCmd}", "${config.JetifierJar}"},
+ },
+ )
)
func init() {
@@ -371,6 +378,16 @@
})
}
+func TransformJetifier(ctx android.ModuleContext, outputFile android.WritablePath,
+ inputFile android.Path) {
+ ctx.Build(pctx, android.BuildParams{
+ Rule: jetifier,
+ Description: "jetifier",
+ Output: outputFile,
+ Input: inputFile,
+ })
+}
+
type classpath []android.Path
func (x *classpath) FormJavaClassPath(optName string) string {
diff --git a/java/config/config.go b/java/config/config.go
index 6129349..3d27b70 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -123,6 +123,7 @@
pctx.HostJavaToolVariable("DoclavaJar", "doclava.jar")
pctx.HostJavaToolVariable("MetalavaJar", "metalava.jar")
pctx.HostJavaToolVariable("DokkaJar", "dokka.jar")
+ pctx.HostJavaToolVariable("JetifierJar", "jetifier.jar")
pctx.HostBinToolVariable("SoongJavacWrapper", "soong_javac_wrapper")
diff --git a/java/java.go b/java/java.go
index 295863f..b911078 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1582,6 +1582,9 @@
// List of directories to remove from the jar file(s)
Exclude_dirs []string
+
+ // if set to true, run Jetifier against .jar file. Defaults to false.
+ Jetifier_enabled *bool
}
type Import struct {
@@ -1622,9 +1625,15 @@
func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
jars := ctx.ExpandSources(j.properties.Jars, nil)
- outputFile := android.PathForModuleOut(ctx, "classes.jar")
+ jarName := ctx.ModuleName() + ".jar"
+ outputFile := android.PathForModuleOut(ctx, "combined", jarName)
TransformJarsToJar(ctx, outputFile, "for prebuilts", jars, android.OptionalPath{},
false, j.properties.Exclude_files, j.properties.Exclude_dirs)
+ if Bool(j.properties.Jetifier_enabled) {
+ inputFile := outputFile
+ outputFile = android.PathForModuleOut(ctx, "jetifier", jarName)
+ TransformJetifier(ctx, outputFile, inputFile)
+ }
j.combinedClasspathFile = outputFile
ctx.VisitDirectDeps(func(module android.Module) {