diff --git a/apex/apex.go b/apex/apex.go index dca55958b..66c598c3c 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -567,7 +567,7 @@ var ( certificateTag = dependencyTag{name: "certificate"} executableTag = dependencyTag{name: "executable", payload: true} fsTag = dependencyTag{name: "filesystem", payload: true} - bootImageTag = dependencyTag{name: "bootImage", payload: true} + bootImageTag = dependencyTag{name: "bootImage", payload: true, sourceOnly: true} compatConfigTag = dependencyTag{name: "compatConfig", payload: true, sourceOnly: true} javaLibTag = dependencyTag{name: "javaLib", payload: true} jniLibTag = dependencyTag{name: "jniLib", payload: true} diff --git a/apex/boot_image_test.go b/apex/boot_image_test.go index 7e37e4229..dcf424071 100644 --- a/apex/boot_image_test.go +++ b/apex/boot_image_test.go @@ -190,6 +190,16 @@ func TestBootImageInApex(t *testing.T) { "myapex", ], } + + // Make sure that a preferred prebuilt doesn't affect the apex. + prebuilt_boot_image { + name: "mybootimage", + image_name: "boot", + prefer: true, + apex_available: [ + "myapex", + ], + } `) ensureExactContents(t, result.TestContext, "myapex", "android_common_myapex_image", []string{ @@ -206,6 +216,11 @@ func TestBootImageInApex(t *testing.T) { "javalib/arm64/boot-foo.oat", "javalib/arm64/boot-foo.vdex", }) + + java.CheckModuleDependencies(t, result.TestContext, "myapex", "android_common_myapex_image", []string{ + `myapex.key`, + `mybootimage`, + }) } // TODO(b/177892522) - add test for host apex.