Add system_$(VER)
The system_$(VER) is added for vendor, similar to sdk.
Bug: 67724799
Test: build
Merged-In: I2545c92707591ca278066870c74e9f49e9825855
Change-Id: I2545c92707591ca278066870c74e9f49e9825855
(cherry picked from commit b8baff1fa353a311c3dd918dfa29ec45dd0168be)
diff --git a/java/java.go b/java/java.go
index f875c79..4355200 100644
--- a/java/java.go
+++ b/java/java.go
@@ -251,7 +251,7 @@
case "", "current", "system_current", "test_current":
return 10000
default:
- if i, err := strconv.Atoi(v); err != nil {
+ if i, err := strconv.Atoi(android.GetNumericSdkVersion(v)); err != nil {
ctx.PropertyErrorf("sdk_version", "invalid sdk version")
return -1
} else {
@@ -275,6 +275,12 @@
aidlPath := android.ExistentPathForSource(ctx, "sdkdir", aidl)
if (!jarPath.Valid() || !aidlPath.Valid()) && ctx.Config().AllowMissingDependencies() {
+ if strings.Contains(v, "system_") {
+ return sdkDep{
+ invalidVersion: true,
+ module: "vsdk_v" + strings.Replace(v, "system_", "", 1),
+ }
+ }
return sdkDep{
invalidVersion: true,
module: "sdk_v" + v,
@@ -887,7 +893,7 @@
case "", "current", "test_current", "system_current":
return strconv.Itoa(ctx.Config().DefaultAppTargetSdkInt())
default:
- return String(j.deviceProperties.Sdk_version)
+ return android.GetNumericSdkVersion(String(j.deviceProperties.Sdk_version))
}
}