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 Paul Duffin <paulduffin@google.com> 2020-09-30 16:20:17 +0100
commitfb6ae5bc73ecaf00e5b2be1ed9640bdd1f21c22e (patch)
tree32f1e0e6cb6c4bcc4e77af6586fe6c473b11402f /java/testing.go
parent6c76f18aae0bb56ac25f8cb496282bf32bfb31a3 (diff)
Add support for using sdk_version: "module_<ver>"
Fixes a panic when trying to build something with sdk_version: "module_30". Test: m nothing Change-Id: 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 a47241323..461fd3f9f 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -55,6 +55,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,