Pass --min-sdk-version to dx
Pass the sdk_version property, the platform sdk version, or 10000
to dx as --min-sdk-version.
Test: m -j checkbuild
Change-Id: I5fae03f44153dc2d6244c33f4c055e746980aefe
diff --git a/java/java.go b/java/java.go
index 89c2016..9888b38 100644
--- a/java/java.go
+++ b/java/java.go
@@ -407,6 +407,16 @@
"--dump-width=1000")
}
+ var minSdkVersion string
+ switch j.deviceProperties.Sdk_version {
+ case "", "current", "test_current", "system_current":
+ minSdkVersion = strconv.Itoa(ctx.AConfig().DefaultAppTargetSdkInt())
+ default:
+ minSdkVersion = j.deviceProperties.Sdk_version
+ }
+
+ dxFlags = append(dxFlags, "--min-sdk-version="+minSdkVersion)
+
flags.dxFlags = strings.Join(dxFlags, " ")
// Compile classes.jar into classes.dex