Migrate sdk tests away from checkAndroidBpContents
Replaces a single call to checkAndroidBpContents(...) with separate calls to check the versioned and unversioned Android.bp files. Test: m nothing Bug: 179354495 Change-Id: I270bf73909958d97b2f298e8d7f6d10a1f75ae71
This commit is contained in:
@@ -43,7 +43,18 @@ func TestModuleExportsSnapshot(t *testing.T) {
|
||||
})
|
||||
|
||||
CheckSnapshot(t, result, "myexports", "package",
|
||||
checkAndroidBpContents(`
|
||||
checkUnversionedAndroidBpContents(`
|
||||
// This is auto-generated. DO NOT EDIT.
|
||||
|
||||
java_import {
|
||||
name: "myjavalib",
|
||||
prefer: false,
|
||||
visibility: ["//visibility:public"],
|
||||
apex_available: ["//apex_available:platform"],
|
||||
jars: ["java/myjavalib.jar"],
|
||||
}
|
||||
`),
|
||||
checkVersionedAndroidBpContents(`
|
||||
// This is auto-generated. DO NOT EDIT.
|
||||
|
||||
java_import {
|
||||
@@ -54,18 +65,11 @@ java_import {
|
||||
jars: ["java/myjavalib.jar"],
|
||||
}
|
||||
|
||||
java_import {
|
||||
name: "myjavalib",
|
||||
prefer: false,
|
||||
visibility: ["//visibility:public"],
|
||||
apex_available: ["//apex_available:platform"],
|
||||
jars: ["java/myjavalib.jar"],
|
||||
}
|
||||
|
||||
module_exports_snapshot {
|
||||
name: "myexports@current",
|
||||
visibility: ["//visibility:public"],
|
||||
java_libs: ["myexports_myjavalib@current"],
|
||||
}
|
||||
`))
|
||||
`),
|
||||
)
|
||||
}
|
||||
|
Reference in New Issue
Block a user