commit a2adc37fc92587af0f09aa6f4aceacf8fc49aa66
author Anton Hansson <hansson@google.com> Fri Jul 03 15:31:32 2020 +0100
committer Liz Kammer <eakammer@google.com> Fri Sep 18 08:06:58 2020 -0700
tree 741c3d93ca9ce3e02ea3fd7c21ff9460abff99cd
parent 0fe609075dd5614ddc99d17f1afaa6306f9a8b10

Make hiddenapi use prebuilt stubs when it should

Bug: 160455085
Test: build_unbundled_mainline_module.sh (with disabled source-stubs)
Test: hiddenapi_singleton_test.go
Change-Id: Id93c974351b3f8efdf8e4efe4192d3809f4fcaa5

java/testing.go

diff --git a/java/testing.go b/java/testing.go
index 322dc9e..a472413 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -88,7 +88,7 @@
 		"prebuilts/sdk/30/system/api/bar-removed.txt":              nil,
 		"prebuilts/sdk/30/test/api/bar-removed.txt":                nil,
 		"prebuilts/sdk/tools/core-lambda-stubs.jar":                nil,
-		"prebuilts/sdk/Android.bp":                                 []byte(`prebuilt_apis { name: "sdk", api_dirs: ["14", "28", "30", "current"],}`),
+		"prebuilts/sdk/Android.bp":                                 []byte(`prebuilt_apis { name: "sdk", api_dirs: ["14", "28", "30", "current"], imports_sdk_version: "none", imports_compile_dex:true,}`),
 
 		"bin.py": nil,
 		python.StubTemplateHost: []byte(`PYTHON_BINARY = '%interpreter%'