Stop using versioned snapshots in TestBasicSdkWithBootclasspathFragment
In preparation for removing support for versioned snapshots from Soong this change rewrites TestBasicSdkWithBootclasspathFragment to use non-versioned prebuilts making it more realistic in the process. Bug: 260237150 Test: m nothing Change-Id: I99d1ad9b480657bb805c3d48e99e715052f4d00a
This commit is contained in:
@@ -664,7 +664,15 @@ func TestBasicSdkWithBootclasspathFragment(t *testing.T) {
|
||||
android.GroupFixturePreparers(
|
||||
prepareForSdkTestWithApex,
|
||||
prepareForSdkTestWithJava,
|
||||
android.FixtureAddFile("java/mybootlib.jar", nil),
|
||||
android.FixtureMergeMockFs(android.MockFS{
|
||||
"java/mybootlib.jar": nil,
|
||||
"hiddenapi/annotation-flags.csv": nil,
|
||||
"hiddenapi/index.csv": nil,
|
||||
"hiddenapi/metadata.csv": nil,
|
||||
"hiddenapi/signature-patterns.csv": nil,
|
||||
"hiddenapi/filtered-stub-flags.csv": nil,
|
||||
"hiddenapi/filtered-flags.csv": nil,
|
||||
}),
|
||||
android.FixtureWithRootAndroidBp(`
|
||||
sdk {
|
||||
name: "mysdk",
|
||||
@@ -691,26 +699,27 @@ func TestBasicSdkWithBootclasspathFragment(t *testing.T) {
|
||||
compile_dex: true,
|
||||
}
|
||||
|
||||
sdk_snapshot {
|
||||
name: "mysdk@1",
|
||||
bootclasspath_fragments: ["mysdk_mybootclasspathfragment@1"],
|
||||
}
|
||||
|
||||
prebuilt_bootclasspath_fragment {
|
||||
name: "mysdk_mybootclasspathfragment@1",
|
||||
sdk_member_name: "mybootclasspathfragment",
|
||||
name: "mybootclasspathfragment",
|
||||
prefer: false,
|
||||
visibility: ["//visibility:public"],
|
||||
apex_available: [
|
||||
"myapex",
|
||||
],
|
||||
image_name: "art",
|
||||
contents: ["mysdk_mybootlib@1"],
|
||||
contents: ["mybootlib"],
|
||||
hidden_api: {
|
||||
annotation_flags: "hiddenapi/annotation-flags.csv",
|
||||
metadata: "hiddenapi/metadata.csv",
|
||||
index: "hiddenapi/index.csv",
|
||||
signature_patterns: "hiddenapi/signature-patterns.csv",
|
||||
filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
|
||||
filtered_flags: "hiddenapi/filtered-flags.csv",
|
||||
},
|
||||
}
|
||||
|
||||
java_import {
|
||||
name: "mysdk_mybootlib@1",
|
||||
sdk_member_name: "mybootlib",
|
||||
name: "mybootlib",
|
||||
visibility: ["//visibility:public"],
|
||||
apex_available: ["com.android.art"],
|
||||
jars: ["java/mybootlib.jar"],
|
||||
|
Reference in New Issue
Block a user