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:
Colin Cross
2019-03-21 22:21:39 -07:00
parent e9665723da
commit 1001a7971a
4 changed files with 7 additions and 4 deletions

View File

@@ -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)