Move TestConfig sdk versions forward
The SDK version in TestConfig is very old, move it forward to trigger
the newer javaVersion code paths.
Bug: 142896162
Test: all Soong tests
Change-Id: Iaf2a6f6dfef43b006b0a09f193fbc2d2e103d90d
diff --git a/java/sdk_test.go b/java/sdk_test.go
index ea00bae..647a0b9 100644
--- a/java/sdk_test.go
+++ b/java/sdk_test.go
@@ -74,12 +74,12 @@
},
{
- name: "sdk v25",
- properties: `sdk_version: "25",`,
+ name: "sdk v29",
+ properties: `sdk_version: "29",`,
bootclasspath: []string{`""`},
forces8: true,
- java8classpath: []string{"prebuilts/sdk/25/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
- aidl: "-pprebuilts/sdk/25/public/framework.aidl",
+ java8classpath: []string{"prebuilts/sdk/29/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ aidl: "-pprebuilts/sdk/29/public/framework.aidl",
},
{
@@ -99,12 +99,12 @@
},
{
- name: "system_25",
- properties: `sdk_version: "system_25",`,
+ name: "system_29",
+ properties: `sdk_version: "system_29",`,
bootclasspath: []string{`""`},
forces8: true,
- java8classpath: []string{"prebuilts/sdk/25/system/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
- aidl: "-pprebuilts/sdk/25/public/framework.aidl",
+ java8classpath: []string{"prebuilts/sdk/29/system/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ aidl: "-pprebuilts/sdk/29/public/framework.aidl",
},
{
@@ -162,13 +162,13 @@
},
{
- name: "unbundled sdk v25",
+ name: "unbundled sdk v29",
unbundled: true,
- properties: `sdk_version: "25",`,
+ properties: `sdk_version: "29",`,
bootclasspath: []string{`""`},
forces8: true,
- java8classpath: []string{"prebuilts/sdk/25/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
- aidl: "-pprebuilts/sdk/25/public/framework.aidl",
+ java8classpath: []string{"prebuilts/sdk/29/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ aidl: "-pprebuilts/sdk/29/public/framework.aidl",
},
{
@@ -186,8 +186,8 @@
pdk: true,
bootclasspath: []string{`""`},
forces8: true,
- java8classpath: []string{"prebuilts/sdk/25/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
- aidl: "-pprebuilts/sdk/25/public/framework.aidl",
+ java8classpath: []string{"prebuilts/sdk/29/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ aidl: "-pprebuilts/sdk/29/public/framework.aidl",
},
{
name: "pdk current",
@@ -195,17 +195,17 @@
properties: `sdk_version: "current",`,
bootclasspath: []string{`""`},
forces8: true,
- java8classpath: []string{"prebuilts/sdk/25/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
- aidl: "-pprebuilts/sdk/25/public/framework.aidl",
+ java8classpath: []string{"prebuilts/sdk/29/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ aidl: "-pprebuilts/sdk/29/public/framework.aidl",
},
{
- name: "pdk 25",
+ name: "pdk 29",
pdk: true,
- properties: `sdk_version: "25",`,
+ properties: `sdk_version: "29",`,
bootclasspath: []string{`""`},
forces8: true,
- java8classpath: []string{"prebuilts/sdk/25/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
- aidl: "-pprebuilts/sdk/25/public/framework.aidl",
+ java8classpath: []string{"prebuilts/sdk/29/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ aidl: "-pprebuilts/sdk/29/public/framework.aidl",
},
}