diff options
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 63 |
1 files changed, 4 insertions, 59 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 3df43b1c3..6b9944d76 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -4893,7 +4893,6 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { java_import { name: "libfoo", jars: ["libfoo.jar"], - sdk_version: "core_current", } java_sdk_library_import { @@ -4934,22 +4933,6 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { t.Run("prebuilt with source preferred", func(t *testing.T) { bp := ` - apex { - name: "myapex", - key: "myapex.key", - updatable: false, - java_libs: [ - "libfoo", - "libbar", - ], - } - - apex_key { - name: "myapex.key", - public_key: "testkey.avbpubkey", - private_key: "testkey.pem", - } - prebuilt_apex { name: "myapex", arch: { @@ -4966,21 +4949,10 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { java_import { name: "libfoo", jars: ["libfoo.jar"], - apex_available: [ - "myapex", - ], - compile_dex: true, - sdk_version: "core_current", } java_library { name: "libfoo", - srcs: ["foo/bar/MyClass.java"], - apex_available: [ - "myapex", - ], - compile_dex: true, - sdk_version: "core_current", } java_sdk_library_import { @@ -4988,21 +4960,12 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { public: { jars: ["libbar.jar"], }, - apex_available: [ - "myapex", - ], - compile_dex: true, } java_sdk_library { name: "libbar", srcs: ["foo/bar/MyClass.java"], unsafe_ignore_missing_latest_api: true, - apex_available: [ - "myapex", - ], - compile_dex: true, - sdk_version: "core_current", } ` @@ -5011,9 +4974,11 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { checkDexJarBuildPath(t, ctx, "prebuilt_libfoo") checkDexJarInstallPath(t, ctx, "prebuilt_libfoo") + ensureNoSourceVariant(t, ctx, "libfoo") checkDexJarBuildPath(t, ctx, "prebuilt_libbar") checkDexJarInstallPath(t, ctx, "prebuilt_libbar") + ensureNoSourceVariant(t, ctx, "libbar") }) t.Run("prebuilt preferred with source", func(t *testing.T) { @@ -5039,7 +5004,6 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { java_library { name: "libfoo", - sdk_version: "core_current", } java_sdk_library_import { @@ -5166,7 +5130,6 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { jars: ["libfoo.jar"], apex_available: ["myapex"], permitted_packages: ["foo"], - sdk_version: "core_current", } java_sdk_library_import { @@ -5321,14 +5284,12 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { name: "libfoo", jars: ["libfoo.jar"], apex_available: ["myapex"], - sdk_version: "core_current", } java_library { name: "libfoo", srcs: ["foo/bar/MyClass.java"], apex_available: ["myapex"], - sdk_version: "core_current", } java_sdk_library_import { @@ -5420,7 +5381,6 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { jars: ["libfoo.jar"], apex_available: ["myapex"], permitted_packages: ["foo"], - sdk_version: "core_current", } java_library { @@ -5428,7 +5388,6 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { srcs: ["foo/bar/MyClass.java"], apex_available: ["myapex"], installable: true, - sdk_version: "core_current", } java_sdk_library_import { @@ -5519,7 +5478,6 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { name: "libfoo", jars: ["libfoo.jar"], apex_available: ["myapex"], - sdk_version: "core_current", } java_library { @@ -5528,7 +5486,6 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { apex_available: ["myapex"], permitted_packages: ["foo"], installable: true, - sdk_version: "core_current", } java_sdk_library_import { @@ -5547,7 +5504,6 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { apex_available: ["myapex"], permitted_packages: ["bar"], compile_dex: true, - sdk_version: "core_current", } ` @@ -6142,7 +6098,6 @@ func TestApexWithTestHelperApp(t *testing.T) { name: "TesterHelpAppFoo", srcs: ["foo/bar/MyClass.java"], apex_available: [ "myapex" ], - sdk_version: "test_current", } `) @@ -7745,7 +7700,7 @@ func TestSymlinksFromApexToSystem(t *testing.T) { srcs: ["foo/bar/MyClass.java"], sdk_version: "none", system_modules: "none", - static_libs: ["myotherjar"], + libs: ["myotherjar"], apex_available: [ "myapex", "myapex.updatable", @@ -8406,7 +8361,6 @@ func TestUpdatable_should_not_set_generate_classpaths_proto(t *testing.T) { apex_available: [ "myapex", ], - sdk_version: "current", } systemserverclasspath_fragment { @@ -9449,7 +9403,6 @@ func TestApexJavaCoverage(t *testing.T) { srcs: ["mybootclasspathlib.java"], apex_available: ["myapex"], compile_dex: true, - sdk_version: "current", } systemserverclasspath_fragment { @@ -9765,7 +9718,6 @@ func TestSdkLibraryCanHaveHigherMinSdkVersion(t *testing.T) { unsafe_ignore_missing_latest_api: true, min_sdk_version: "31", static_libs: ["util"], - sdk_version: "core_current", } java_library { @@ -9774,7 +9726,6 @@ func TestSdkLibraryCanHaveHigherMinSdkVersion(t *testing.T) { apex_available: ["myapex"], min_sdk_version: "31", static_libs: ["another_util"], - sdk_version: "core_current", } java_library { @@ -9782,7 +9733,6 @@ func TestSdkLibraryCanHaveHigherMinSdkVersion(t *testing.T) { srcs: ["a.java"], min_sdk_version: "31", apex_available: ["myapex"], - sdk_version: "core_current", } `) }) @@ -9838,7 +9788,7 @@ func TestSdkLibraryCanHaveHigherMinSdkVersion(t *testing.T) { }) t.Run("bootclasspath_fragment jar must set min_sdk_version", func(t *testing.T) { - preparer. + preparer.ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(`module "mybootclasspathlib".*must set min_sdk_version`)). RunTestWithBp(t, ` apex { name: "myapex", @@ -9869,8 +9819,6 @@ func TestSdkLibraryCanHaveHigherMinSdkVersion(t *testing.T) { apex_available: ["myapex"], compile_dex: true, unsafe_ignore_missing_latest_api: true, - sdk_version: "current", - min_sdk_version: "30", } `) }) @@ -10123,9 +10071,6 @@ func TestApexLintBcpFragmentSdkLibDeps(t *testing.T) { key: "myapex.key", bootclasspath_fragments: ["mybootclasspathfragment"], min_sdk_version: "29", - java_libs: [ - "jacocoagent", - ], } apex_key { name: "myapex.key", |