diff options
| author | 2019-03-23 06:09:25 +0000 | |
|---|---|---|
| committer | 2019-03-23 06:09:25 +0000 | |
| commit | 4ada982da9e73f9ee69cf485283c761061411163 (patch) | |
| tree | 5aa7aa179e19944a8596207791859cf9500579e7 /java/java.go | |
| parent | 66f2e8701e68f18d600c91a7c0779d4b9c8db3fe (diff) | |
| parent | 1001a7971a298f83ed833d5df151c5f5694912e8 (diff) | |
Merge "Rename jetifier property and add it to androidmk"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 3eae93294..1fd0a9e31 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) |