Rename jetifier property and add it to androidmk
Rename jetifier_enabled to jetifier since there are no users yet and it is more consistent with the rest of the Soong properties. Also add it to androidmk translation. Fixes: 123524520 Test: androidmk_test.go Change-Id: Ib4c688cf3cb171a822ddf7dd49467522c4c1276c
This commit is contained in:
@@ -446,7 +446,7 @@ type AARImportProperties struct {
|
||||
Libs []string
|
||||
|
||||
// if set to true, run Jetifier against .aar file. Defaults to false.
|
||||
Jetifier_enabled *bool
|
||||
Jetifier *bool
|
||||
}
|
||||
|
||||
type AARImport struct {
|
||||
@@ -540,7 +540,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
aarName := ctx.ModuleName() + ".aar"
|
||||
var aar android.Path
|
||||
aar = android.PathForModuleSrc(ctx, a.properties.Aars[0])
|
||||
if Bool(a.properties.Jetifier_enabled) {
|
||||
if Bool(a.properties.Jetifier) {
|
||||
inputFile := aar
|
||||
aar = android.PathForModuleOut(ctx, "jetifier", aarName)
|
||||
TransformJetifier(ctx, aar.(android.WritablePath), inputFile)
|
||||
|
@@ -1726,7 +1726,7 @@ type ImportProperties struct {
|
||||
Exclude_dirs []string
|
||||
|
||||
// if set to true, run Jetifier against .jar file. Defaults to false.
|
||||
Jetifier_enabled *bool
|
||||
Jetifier *bool
|
||||
}
|
||||
|
||||
type Import struct {
|
||||
@@ -1771,7 +1771,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
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) {
|
||||
if Bool(j.properties.Jetifier) {
|
||||
inputFile := outputFile
|
||||
outputFile = android.PathForModuleOut(ctx, "jetifier", jarName)
|
||||
TransformJetifier(ctx, outputFile, inputFile)
|
||||
|
Reference in New Issue
Block a user