StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some minor issues with boot_image" am: aded43c808 am: 92db324beb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1566176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54537d03a79ad26895ecbee9be0e64fbde575c0f
This commit is contained in:
Paul Duffin
2021-02-01 11:02:35 +00:00
committed by Automerger Merge Worker
parent 4694cf7c81 92db324beb
commit 2c1c3cac9e
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apex/boot_image_test.go
View File

@@ -71,6 +71,16 @@ func TestBootImages(t *testing.T) {
], ],
srcs: ["b.java"], srcs: ["b.java"],
} }
boot_image {
name: "art-boot-image",
image_name: "art",
}
boot_image {
name: "framework-boot-image",
image_name: "boot",
}
`, `,
// Configure some libraries in the art and framework boot images. // Configure some libraries in the art and framework boot images.
withArtBootImageJars("com.android.art:baz", "com.android.art:quuz"), withArtBootImageJars("com.android.art:baz", "com.android.art:quuz"),

2
java/boot_image.go
View File

@@ -48,7 +48,7 @@ type BootImageModule struct {
func bootImageFactory() android.Module { func bootImageFactory() android.Module {
m := &BootImageModule{} m := &BootImageModule{}
m.AddProperties(&m.properties) m.AddProperties(&m.properties)
android.InitAndroidArchModule(m, android.HostAndDeviceDefault, android.MultilibCommon) android.InitAndroidArchModule(m, android.HostAndDeviceSupported, android.MultilibCommon)
android.InitApexModule(m) android.InitApexModule(m)
return m return m
} }

10
java/testing.go
View File

@@ -219,16 +219,6 @@ func GatherRequiredDepsForTest() string {
dex_bootjars { dex_bootjars {
name: "dex_bootjars", name: "dex_bootjars",
} }
boot_image {
name: "art-boot-image",
image_name: "art",
}
boot_image {
name: "framework-boot-image",
image_name: "boot",
}
` `
return bp return bp