Revert "Add min_sdk_version to java_import."
This reverts commit 6d15d63556
.
Reason for revert: Broke git_sc-mainline-prod on test_suites_x86_64
Fixes: 184305592
Change-Id: I4b2e2675e0dd9e2e84966f545a52f45d5b731bab
This commit is contained in:
@@ -1808,30 +1808,6 @@ func TestApexMinSdkVersion_ErrorIfIncompatibleVersion(t *testing.T) {
|
||||
min_sdk_version: "30",
|
||||
}
|
||||
`)
|
||||
|
||||
testApexError(t, `module "libfoo".*: should support min_sdk_version\(29\)`, `
|
||||
apex {
|
||||
name: "myapex",
|
||||
key: "myapex.key",
|
||||
java_libs: ["libfoo"],
|
||||
min_sdk_version: "29",
|
||||
}
|
||||
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}
|
||||
|
||||
java_import {
|
||||
name: "libfoo",
|
||||
jars: ["libfoo.jar"],
|
||||
apex_available: [
|
||||
"myapex",
|
||||
],
|
||||
min_sdk_version: "30",
|
||||
}
|
||||
`)
|
||||
}
|
||||
|
||||
func TestApexMinSdkVersion_Okay(t *testing.T) {
|
||||
@@ -1869,10 +1845,7 @@ func TestApexMinSdkVersion_Okay(t *testing.T) {
|
||||
name: "libbar",
|
||||
sdk_version: "current",
|
||||
srcs: ["a.java"],
|
||||
static_libs: [
|
||||
"libbar_dep",
|
||||
"libbar_import_dep",
|
||||
],
|
||||
static_libs: ["libbar_dep"],
|
||||
apex_available: ["myapex"],
|
||||
min_sdk_version: "29",
|
||||
}
|
||||
@@ -1884,13 +1857,6 @@ func TestApexMinSdkVersion_Okay(t *testing.T) {
|
||||
apex_available: ["myapex"],
|
||||
min_sdk_version: "29",
|
||||
}
|
||||
|
||||
java_import {
|
||||
name: "libbar_import_dep",
|
||||
jars: ["libbar.jar"],
|
||||
apex_available: ["myapex"],
|
||||
min_sdk_version: "29",
|
||||
}
|
||||
`)
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user