aboutsummaryrefslogtreecommitdiffstats
path: root/java/java_test.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-04-03 14:04:07 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-03 14:04:07 -0700
commit49c87dfae95b0315cc5c7ca2d4491f90b02bcb4b (patch)
tree450b997b8e161fd0983ec43d0c8b2af13734b5a2 /java/java_test.go
parent673f43b05f24a3658a82043ce5dc4753834fe262 (diff)
parent209edee4251d6dbb58571f96773a0d9787d33365 (diff)
downloadandroid_build_soong-49c87dfae95b0315cc5c7ca2d4491f90b02bcb4b.tar.gz
android_build_soong-49c87dfae95b0315cc5c7ca2d4491f90b02bcb4b.tar.bz2
android_build_soong-49c87dfae95b0315cc5c7ca2d4491f90b02bcb4b.zip
Merge "Fix sdk_version: "system_current" when Platform_sdk_final=true" am: b007b2bde5 am: 8c3f398c6c
am: 209edee425 Change-Id: I54ea846c9ac2b29354109755225db71dcdaa1527
Diffstat (limited to 'java/java_test.go')
-rw-r--r--java/java_test.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go
index ec4c100f..41586217 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -138,6 +138,9 @@ func testContext(config android.Config, bp string,
"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/current/core/android.jar": nil,
"prebuilts/sdk/current/public/android.jar": nil,
"prebuilts/sdk/current/public/framework.aidl": nil,