From bb678f82d6bb5cd89bf282e88a879123d9763d61 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Mon, 1 Jul 2024 17:04:46 +0000 Subject: Implement detecting container violations. This change introduces a method to detect violating inter-container dependencies between modules. The method is run in `ModuleBase.GenerateBuildActions`, after the container info provider is set. Given that the provider of the direct dependencies would have been set at this time, the method utilizes this information to determine the violations, which are introduced in https://r.android.com/3141104. Note that this enforcement does not turn all inter-container dependencies as errors. Instead, it will only turn dependencies that matches the pre-defined violations into errors. Even if the dependency matches the violation, an error will not be thrown if the dependency satisfies any of the exception functions (e.g. the dependent module is stubs, or the two modules belong to the same apexes). Test: m nothing --no-skip-soong-tests Bug: 338660802 Change-Id: I36e9cd956c5a076a53635be0c6ff27f77725516e --- apex/apex_test.go | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 4 deletions(-) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index 6b9944d76..3df43b1c3 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -4893,6 +4893,7 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { java_import { name: "libfoo", jars: ["libfoo.jar"], + sdk_version: "core_current", } java_sdk_library_import { @@ -4933,6 +4934,22 @@ 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: { @@ -4949,10 +4966,21 @@ 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 { @@ -4960,12 +4988,21 @@ 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", } ` @@ -4974,11 +5011,9 @@ 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) { @@ -5004,6 +5039,7 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { java_library { name: "libfoo", + sdk_version: "core_current", } java_sdk_library_import { @@ -5130,6 +5166,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { jars: ["libfoo.jar"], apex_available: ["myapex"], permitted_packages: ["foo"], + sdk_version: "core_current", } java_sdk_library_import { @@ -5284,12 +5321,14 @@ 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 { @@ -5381,6 +5420,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { jars: ["libfoo.jar"], apex_available: ["myapex"], permitted_packages: ["foo"], + sdk_version: "core_current", } java_library { @@ -5388,6 +5428,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { srcs: ["foo/bar/MyClass.java"], apex_available: ["myapex"], installable: true, + sdk_version: "core_current", } java_sdk_library_import { @@ -5478,6 +5519,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { name: "libfoo", jars: ["libfoo.jar"], apex_available: ["myapex"], + sdk_version: "core_current", } java_library { @@ -5486,6 +5528,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { apex_available: ["myapex"], permitted_packages: ["foo"], installable: true, + sdk_version: "core_current", } java_sdk_library_import { @@ -5504,6 +5547,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { apex_available: ["myapex"], permitted_packages: ["bar"], compile_dex: true, + sdk_version: "core_current", } ` @@ -6098,6 +6142,7 @@ func TestApexWithTestHelperApp(t *testing.T) { name: "TesterHelpAppFoo", srcs: ["foo/bar/MyClass.java"], apex_available: [ "myapex" ], + sdk_version: "test_current", } `) @@ -7700,7 +7745,7 @@ func TestSymlinksFromApexToSystem(t *testing.T) { srcs: ["foo/bar/MyClass.java"], sdk_version: "none", system_modules: "none", - libs: ["myotherjar"], + static_libs: ["myotherjar"], apex_available: [ "myapex", "myapex.updatable", @@ -8361,6 +8406,7 @@ func TestUpdatable_should_not_set_generate_classpaths_proto(t *testing.T) { apex_available: [ "myapex", ], + sdk_version: "current", } systemserverclasspath_fragment { @@ -9403,6 +9449,7 @@ func TestApexJavaCoverage(t *testing.T) { srcs: ["mybootclasspathlib.java"], apex_available: ["myapex"], compile_dex: true, + sdk_version: "current", } systemserverclasspath_fragment { @@ -9718,6 +9765,7 @@ func TestSdkLibraryCanHaveHigherMinSdkVersion(t *testing.T) { unsafe_ignore_missing_latest_api: true, min_sdk_version: "31", static_libs: ["util"], + sdk_version: "core_current", } java_library { @@ -9726,6 +9774,7 @@ func TestSdkLibraryCanHaveHigherMinSdkVersion(t *testing.T) { apex_available: ["myapex"], min_sdk_version: "31", static_libs: ["another_util"], + sdk_version: "core_current", } java_library { @@ -9733,6 +9782,7 @@ func TestSdkLibraryCanHaveHigherMinSdkVersion(t *testing.T) { srcs: ["a.java"], min_sdk_version: "31", apex_available: ["myapex"], + sdk_version: "core_current", } `) }) @@ -9788,7 +9838,7 @@ func TestSdkLibraryCanHaveHigherMinSdkVersion(t *testing.T) { }) t.Run("bootclasspath_fragment jar must set min_sdk_version", func(t *testing.T) { - preparer.ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(`module "mybootclasspathlib".*must set min_sdk_version`)). + preparer. RunTestWithBp(t, ` apex { name: "myapex", @@ -9819,6 +9869,8 @@ func TestSdkLibraryCanHaveHigherMinSdkVersion(t *testing.T) { apex_available: ["myapex"], compile_dex: true, unsafe_ignore_missing_latest_api: true, + sdk_version: "current", + min_sdk_version: "30", } `) }) @@ -10071,6 +10123,9 @@ func TestApexLintBcpFragmentSdkLibDeps(t *testing.T) { key: "myapex.key", bootclasspath_fragments: ["mybootclasspathfragment"], min_sdk_version: "29", + java_libs: [ + "jacocoagent", + ], } apex_key { name: "myapex.key", -- cgit v1.2.3-59-g8ed1b