From fb6ae5bc73ecaf00e5b2be1ed9640bdd1f21c22e Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 30 Sep 2020 15:17:25 +0100 Subject: Add support for using sdk_version: "module_" Fixes a panic when trying to build something with sdk_version: "module_30". Test: m nothing Change-Id: I9b2ce50957f59e2bead335ffa58888e15cda1f78 --- java/testing.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'java/testing.go') 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, -- cgit v1.2.3-59-g8ed1b