summaryrefslogtreecommitdiff
path: root/java/testing.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2020-09-30 15:17:25 +0100
committer Anton Hansson <hansson@google.com> 2021-03-04 08:11:48 +0000
commit5a6cfa060b81a50dbf9acdc32f99413655518bd8 (patch)
tree19e956694525135776b31e8d731f3611a2f9354d /java/testing.go
parentf17a64cd602ae6f18d0aff76ca56f8493db74dee (diff)
Add support for using sdk_version: "module_<ver>"
Fixes a panic when trying to build something with sdk_version: "module_30". Change-Id: I5b625eee45130cc288e3082d05fe45c9d006d0b6 Test: m nothing Merged-In: I9b2ce50957f59e2bead335ffa58888e15cda1f78
Diffstat (limited to 'java/testing.go')
-rw-r--r--java/testing.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/testing.go b/java/testing.go
index 6b105bdaa..f373d7718 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -46,6 +46,8 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string
"prebuilts/sdk/30/public/framework.aidl": nil,
"prebuilts/sdk/30/system/android.jar": nil,
"prebuilts/sdk/30/system/foo.jar": nil,
+ "prebuilts/sdk/30/module-lib/android.jar": nil,
+ "prebuilts/sdk/30/module-lib/foo.jar": nil,
"prebuilts/sdk/30/public/core-for-system-modules.jar": nil,
"prebuilts/sdk/current/core/android.jar": nil,
"prebuilts/sdk/current/public/android.jar": nil,