diff options
| author | 2019-10-29 21:08:33 +0000 | |
|---|---|---|
| committer | 2019-10-29 21:08:33 +0000 | |
| commit | ec90e44ce786c3a560e7ab7c0666714c8c744cb4 (patch) | |
| tree | c416d66535f1fb4673a9ac4c1a8ade27a97699e2 /java/java_test.go | |
| parent | 657615e0d6a6b60a77b9efe766eb9e60bc3b94e1 (diff) | |
| parent | 6cef481ee7c27ee08b9da3ace059860851cd8b69 (diff) | |
Merge changes Icfd32d0a,Icc9ff4d4,Ieee07502,I559eeb1f,Iaf2a6f6d, ...
* changes:
Use java language 1.9 for sdk_version: "current"
Remove special case for sdk_version: "none"
Use system modules for turbine
Make javaVersion an enum
Move TestConfig sdk versions forward
Split java 8 and 9 classpaths in TestClasspath
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/java_test.go b/java/java_test.go index 3767d1b24..a6ae50375 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -148,9 +148,9 @@ func testContext(bp string, fs map[string][]byte) *android.TestContext { "prebuilts/sdk/17/public/android.jar": nil, "prebuilts/sdk/17/public/framework.aidl": nil, "prebuilts/sdk/17/system/android.jar": nil, - "prebuilts/sdk/25/public/android.jar": nil, - "prebuilts/sdk/25/public/framework.aidl": nil, - "prebuilts/sdk/25/system/android.jar": nil, + "prebuilts/sdk/29/public/android.jar": nil, + "prebuilts/sdk/29/public/framework.aidl": nil, + "prebuilts/sdk/29/system/android.jar": nil, "prebuilts/sdk/current/core/android.jar": nil, "prebuilts/sdk/current/public/android.jar": nil, "prebuilts/sdk/current/public/framework.aidl": nil, |