Perform CheckMinSdkVersion for java_sdk_library.
In a follow up, apex would expect that any module that implements ModuleWithMinSdkVersionCheck to have performed appropate checks on min_sdk_version, to allow relaxing some of the existing conditions. This change moves the responsibility of checking min_sdk_version of java_sdk_library to java_sdk_library itself. Bug: 205923322 Test: presubmit Change-Id: I79b5a1fc34098fff60221e416db6e6e69e01f531
This commit is contained in:
@@ -1140,3 +1140,87 @@ func TestJavaSdkLibraryDist(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestSdkLibrary_CheckMinSdkVersion(t *testing.T) {
|
||||
preparer := android.GroupFixturePreparers(
|
||||
PrepareForTestWithJavaBuildComponents,
|
||||
PrepareForTestWithJavaDefaultModules,
|
||||
PrepareForTestWithJavaSdkLibraryFiles,
|
||||
)
|
||||
|
||||
preparer.RunTestWithBp(t, `
|
||||
java_sdk_library {
|
||||
name: "sdklib",
|
||||
srcs: ["a.java"],
|
||||
static_libs: ["util"],
|
||||
min_sdk_version: "30",
|
||||
unsafe_ignore_missing_latest_api: true,
|
||||
}
|
||||
|
||||
java_library {
|
||||
name: "util",
|
||||
srcs: ["a.java"],
|
||||
min_sdk_version: "30",
|
||||
}
|
||||
`)
|
||||
|
||||
preparer.
|
||||
RunTestWithBp(t, `
|
||||
java_sdk_library {
|
||||
name: "sdklib",
|
||||
srcs: ["a.java"],
|
||||
libs: ["util"],
|
||||
impl_only_libs: ["util"],
|
||||
stub_only_libs: ["util"],
|
||||
stub_only_static_libs: ["util"],
|
||||
min_sdk_version: "30",
|
||||
unsafe_ignore_missing_latest_api: true,
|
||||
}
|
||||
|
||||
java_library {
|
||||
name: "util",
|
||||
srcs: ["a.java"],
|
||||
}
|
||||
`)
|
||||
|
||||
preparer.ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(`module "util".*should support min_sdk_version\(30\)`)).
|
||||
RunTestWithBp(t, `
|
||||
java_sdk_library {
|
||||
name: "sdklib",
|
||||
srcs: ["a.java"],
|
||||
static_libs: ["util"],
|
||||
min_sdk_version: "30",
|
||||
unsafe_ignore_missing_latest_api: true,
|
||||
}
|
||||
|
||||
java_library {
|
||||
name: "util",
|
||||
srcs: ["a.java"],
|
||||
min_sdk_version: "31",
|
||||
}
|
||||
`)
|
||||
|
||||
preparer.ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(`module "another_util".*should support min_sdk_version\(30\)`)).
|
||||
RunTestWithBp(t, `
|
||||
java_sdk_library {
|
||||
name: "sdklib",
|
||||
srcs: ["a.java"],
|
||||
static_libs: ["util"],
|
||||
min_sdk_version: "30",
|
||||
unsafe_ignore_missing_latest_api: true,
|
||||
}
|
||||
|
||||
java_library {
|
||||
name: "util",
|
||||
srcs: ["a.java"],
|
||||
static_libs: ["another_util"],
|
||||
min_sdk_version: "30",
|
||||
}
|
||||
|
||||
java_library {
|
||||
name: "another_util",
|
||||
srcs: ["a.java"],
|
||||
min_sdk_version: "31",
|
||||
}
|
||||
`)
|
||||
}
|
||||
|
Reference in New Issue
Block a user