Merge "Introduce AlwaysUsePrebuiltSdks" am: 6df337255c am: 497158434d

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356666 Change-Id: I92deaf13c3c7c7ae684bd11d5bd5d575d264bfb1
2020-08-10 01:25:06 +00:00
parent 24c65f1d1a 497158434d
commit ec87b5c85a
12 changed files with 59 additions and 45 deletions
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -3005,6 +3005,7 @@ func TestUncompressDex(t *testing.T) {
 		config := testAppConfig(nil, bp, nil)
 		if unbundled {
 			config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true)
+			config.TestProductVariables.Always_use_prebuilt_sdks = proptools.BoolPtr(true)
 		}

 		ctx := testContext()