diff options
| author | Colin Cross <ccross@android.com> | 2019-03-22 23:32:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-22 23:32:57 -0700 |
| commit | 593bb1c16c91882409911f8fc5e418994af3ff02 (patch) | |
| tree | 8a5cd7aaaafe5b358027af2bb789ba329a823091 /java | |
| parent | fb96a51b76844e95b57f8dcc4e803f465286d7ce (diff) | |
| parent | eb1cebad0d196dae5a1c2dcf622ed31250f6fc38 (diff) | |
| download | build_soong-593bb1c16c91882409911f8fc5e418994af3ff02.tar.gz build_soong-593bb1c16c91882409911f8fc5e418994af3ff02.tar.bz2 build_soong-593bb1c16c91882409911f8fc5e418994af3ff02.zip | |
Merge "Rename jetifier property and add it to androidmk" am: 4ada982da9 am: 33938d3188
am: eb1cebad0d
Change-Id: I6ae03146be0e84ac0391c5db2a944eb054b8a9e9
Diffstat (limited to 'java')
| -rw-r--r-- | java/aar.go | 4 | ||||
| -rw-r--r-- | java/java.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/aar.go b/java/aar.go index ba9e1873..a993bf6a 100644 --- a/java/aar.go +++ b/java/aar.go @@ -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) diff --git a/java/java.go b/java/java.go index 3eae9329..1fd0a9e3 100644 --- a/java/java.go +++ b/java/java.go @@ -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) |