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

Replace boot image with bootclasspath fragment in sdk package

Browse Source 
Bug: 177892522
Test: m nothing
Change-Id: I67589bccbde426de2caf513bd643d9484df86c1e
This commit is contained in:
Paul Duffin
2021-04-21 23:38:34 +01:00
parent 6589805e2a
commit 0b28a8d356
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/Android.bp
View File

@@ -20,7 +20,7 @@ bootstrap_go_package {
"update.go", "update.go",
], ],
testSrcs: [ testSrcs: [
"boot_image_sdk_test.go", "bootclasspath_fragment_sdk_test.go",
"bp_test.go", "bp_test.go",
"cc_sdk_test.go", "cc_sdk_test.go",
"compat_config_sdk_test.go", "compat_config_sdk_test.go",

38
sdk/boot_image_sdk_test.go → sdk/bootclasspath_fragment_sdk_test.go
View File

@@ -20,17 +20,17 @@ import (
"android/soong/android" "android/soong/android"
) )
func TestSnapshotWithBootImage(t *testing.T) { func TestSnapshotWithBootclasspathFragment(t *testing.T) {
result := android.GroupFixturePreparers( result := android.GroupFixturePreparers(
prepareForSdkTestWithJava, prepareForSdkTestWithJava,
android.FixtureWithRootAndroidBp(` android.FixtureWithRootAndroidBp(`
sdk { sdk {
name: "mysdk", name: "mysdk",
boot_images: ["mybootimage"], bootclasspath_fragments: ["mybootclasspathfragment"],
} }
boot_image { bootclasspath_fragment {
name: "mybootimage", name: "mybootclasspathfragment",
image_name: "art", image_name: "art",
} }
`), `),
@@ -40,8 +40,8 @@ func TestSnapshotWithBootImage(t *testing.T) {
checkUnversionedAndroidBpContents(` checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT. // This is auto-generated. DO NOT EDIT.
prebuilt_boot_image { prebuilt_bootclasspath_fragment {
name: "mybootimage", name: "mybootclasspathfragment",
prefer: false, prefer: false,
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"], apex_available: ["//apex_available:platform"],
@@ -51,9 +51,9 @@ prebuilt_boot_image {
checkVersionedAndroidBpContents(` checkVersionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT. // This is auto-generated. DO NOT EDIT.
prebuilt_boot_image { prebuilt_bootclasspath_fragment {
name: "mysdk_mybootimage@current", name: "mysdk_mybootclasspathfragment@current",
sdk_member_name: "mybootimage", sdk_member_name: "mybootclasspathfragment",
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"], apex_available: ["//apex_available:platform"],
image_name: "art", image_name: "art",
@@ -62,37 +62,37 @@ prebuilt_boot_image {
sdk_snapshot { sdk_snapshot {
name: "mysdk@current", name: "mysdk@current",
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
boot_images: ["mysdk_mybootimage@current"], bootclasspath_fragments: ["mysdk_mybootclasspathfragment@current"],
} }
`), `),
checkAllCopyRules("")) checkAllCopyRules(""))
} }
// Test that boot_image works with sdk. // Test that bootclasspath_fragment works with sdk.
func TestBasicSdkWithBootImage(t *testing.T) { func TestBasicSdkWithBootclasspathFragment(t *testing.T) {
android.GroupFixturePreparers( android.GroupFixturePreparers(
prepareForSdkTestWithApex, prepareForSdkTestWithApex,
prepareForSdkTestWithJava, prepareForSdkTestWithJava,
android.FixtureWithRootAndroidBp(` android.FixtureWithRootAndroidBp(`
sdk { sdk {
name: "mysdk", name: "mysdk",
boot_images: ["mybootimage"], bootclasspath_fragments: ["mybootclasspathfragment"],
} }
boot_image { bootclasspath_fragment {
name: "mybootimage", name: "mybootclasspathfragment",
image_name: "art", image_name: "art",
apex_available: ["myapex"], apex_available: ["myapex"],
} }
sdk_snapshot { sdk_snapshot {
name: "mysdk@1", name: "mysdk@1",
boot_images: ["mybootimage_mysdk_1"], bootclasspath_fragments: ["mybootclasspathfragment_mysdk_1"],
} }
prebuilt_boot_image { prebuilt_bootclasspath_fragment {
name: "mybootimage_mysdk_1", name: "mybootclasspathfragment_mysdk_1",
sdk_member_name: "mybootimage", sdk_member_name: "mybootclasspathfragment",
prefer: false, prefer: false,
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
apex_available: [ apex_available: [