Merge changes I8f4eaed1,I358a62d3

* changes: Dexpreopt standalone system server jars from prebuilts. Dexpreopt standalone system server jars.
2021-12-20 19:52:37 +00:00
parent f1228f570a 28bc9a8a7e
commit 880e11112d
9 changed files with 157 additions and 38 deletions
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -8503,7 +8503,7 @@ func TestAndroidMk_DexpreoptBuiltInstalledForApex_Prebuilt(t *testing.T) {
 		java_import {
 			name: "foo",
 			jars: ["foo.jar"],
-			installable: true,
+			apex_available: ["myapex"],
 		}
 	`,
 		dexpreopt.FixtureSetApexSystemServerJars("myapex:foo"),