Merge changes I8f4eaed1,I358a62d3 am: 880e11112d am: 02d1c10b3a am: 58fe40abc1 am: 3a3250f40e

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1928068 Change-Id: Ie325fa547912fd6618a50b463f40b7a1028047e1
2021-12-20 21:36:09 +00:00
parent dbd3553d83 3a3250f40e
commit 31d2c1f14c
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"),