From a5e26d3cd6ce66d7b3eab9ab19c3fd57deee938b Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 6 Mar 2024 14:04:36 +0000 Subject: Add an apex_contributions_defaults module to module sdk This metadata module will contain a flattened list of all the soong modules contributed by this module to the rest of the build. This is supported in V and above. Bug: 326246905 Test: m art-module-host-exports Test: unzip -p out/soong/mainline-sdks/art-module-host-exports-current.zip Android.bp | grep -A 15 apex_contributions_defaults apex_contributions_defaults { name: "art-module-host-exports.contributions", contents: [ "prebuilt_art.module.api.annotations", "prebuilt_dex2oat", "prebuilt_dex2oatd", "prebuilt_dexdump", "prebuilt_hiddenapi", "prebuilt_oatdump", "prebuilt_profman", "prebuilt_veridex", "prebuilt_libartpalette", "prebuilt_libartbase", ], } Change-Id: Iba43a9da5430adfc0a5fd9b5dc27b5d89c5eacb8 --- sdk/cc_sdk_test.go | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) (limited to 'sdk/cc_sdk_test.go') diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go index 265579aa1..9490d1256 100644 --- a/sdk/cc_sdk_test.go +++ b/sdk/cc_sdk_test.go @@ -123,6 +123,11 @@ func TestSdkCompileMultilibOverride(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_sdkmember"], +} + cc_prebuilt_library_shared { name: "sdkmember", prefer: false, @@ -226,6 +231,11 @@ func TestSnapshotWithObject(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_crtobj"], +} + cc_prebuilt_object { name: "crtobj", prefer: false, @@ -333,6 +343,11 @@ func TestSnapshotWithCcExportGeneratedHeaders(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library_shared { name: "mynativelib", prefer: false, @@ -406,6 +421,11 @@ func TestSnapshotWithCcSharedLibraryCommonProperties(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library_shared { name: "mynativelib", prefer: false, @@ -465,6 +485,11 @@ func TestSnapshotWithCcBinary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mymodule_exports.contributions", + contents: ["prebuilt_mynativebinary"], +} + cc_prebuilt_binary { name: "mynativebinary", prefer: false, @@ -523,6 +548,11 @@ func TestMultipleHostOsTypesSnapshotWithCcBinary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "myexports.contributions", + contents: ["prebuilt_mynativebinary"], +} + cc_prebuilt_binary { name: "mynativebinary", prefer: false, @@ -621,6 +651,14 @@ func TestSnapshotWithSingleHostOsType(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "myexports.contributions", + contents: [ + "prebuilt_mynativebinary", + "prebuilt_mynativelib", + ], +} + cc_prebuilt_binary { name: "mynativebinary", prefer: false, @@ -696,6 +734,11 @@ func TestSnapshotWithCcStaticNocrtBinary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mymodule_exports.contributions", + contents: ["prebuilt_linker"], +} + cc_prebuilt_binary { name: "linker", prefer: false, @@ -755,6 +798,11 @@ func TestSnapshotWithCcSharedLibrary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library_shared { name: "mynativelib", prefer: false, @@ -856,6 +904,15 @@ func TestSnapshotWithCcSharedLibrarySharedLibs(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: [ + "prebuilt_mynativelib", + "prebuilt_myothernativelib", + "prebuilt_mysystemnativelib", + ], +} + cc_prebuilt_library_shared { name: "mynativelib", prefer: false, @@ -953,6 +1010,11 @@ func TestHostSnapshotWithCcSharedLibrary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library_shared { name: "mynativelib", prefer: false, @@ -1029,6 +1091,11 @@ func TestMultipleHostOsTypesSnapshotWithCcSharedLibrary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library_shared { name: "mynativelib", prefer: false, @@ -1095,6 +1162,11 @@ func TestSnapshotWithCcStaticLibrary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "myexports.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library_static { name: "mynativelib", prefer: false, @@ -1158,6 +1230,11 @@ func TestHostSnapshotWithCcStaticLibrary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "myexports.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library_static { name: "mynativelib", prefer: false, @@ -1222,6 +1299,11 @@ func TestSnapshotWithCcLibrary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "myexports.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library { name: "mynativelib", prefer: false, @@ -1298,6 +1380,11 @@ func TestSnapshotSameLibraryWithNativeLibsAndNativeSharedLib(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "myexports.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library { name: "mynativelib", prefer: false, @@ -1394,6 +1481,11 @@ func TestSnapshotSameLibraryWithAndroidNativeLibsAndHostNativeSharedLib(t *testi checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "myexports.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library { name: "mynativelib", prefer: false, @@ -1520,6 +1612,11 @@ func TestHostSnapshotWithMultiLib64(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "myexports.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library_static { name: "mynativelib", prefer: false, @@ -1572,6 +1669,11 @@ func TestSnapshotWithCcHeadersLibrary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mynativeheaders"], +} + cc_prebuilt_library_headers { name: "mynativeheaders", prefer: false, @@ -1594,6 +1696,9 @@ func TestSnapshotWithCcHeadersLibraryAndNativeBridgeSupport(t *testing.T) { PrepareForTestWithSdkBuildComponents, ccTestFs.AddToFixture(), prepareForTestWithNativeBridgeTarget, + android.FixtureRegisterWithContext(func(ctx android.RegistrationContext) { + android.RegisterApexContributionsBuildComponents(ctx) + }), ).RunTestWithBp(t, ` sdk { name: "mysdk", @@ -1616,6 +1721,11 @@ func TestSnapshotWithCcHeadersLibraryAndNativeBridgeSupport(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mynativeheaders"], +} + cc_prebuilt_library_headers { name: "mynativeheaders", prefer: false, @@ -1679,6 +1789,9 @@ func TestSnapshotWithCcHeadersLibraryAndImageVariants(t *testing.T) { cc.PrepareForTestWithCcDefaultModules, PrepareForTestWithSdkBuildComponents, ccTestFs.AddToFixture(), + android.FixtureRegisterWithContext(func(ctx android.RegistrationContext) { + android.RegisterApexContributionsBuildComponents(ctx) + }), ).RunTestWithBp(t, fmt.Sprintf(` sdk { name: "mysdk", @@ -1701,6 +1814,11 @@ func TestSnapshotWithCcHeadersLibraryAndImageVariants(t *testing.T) { checkAndroidBpContents(fmt.Sprintf(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mynativeheaders"], +} + cc_prebuilt_library_headers { name: "mynativeheaders", prefer: false, @@ -1750,6 +1868,11 @@ func TestHostSnapshotWithCcHeadersLibrary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mynativeheaders"], +} + cc_prebuilt_library_headers { name: "mynativeheaders", prefer: false, @@ -1807,6 +1930,11 @@ func TestDeviceAndHostSnapshotWithCcHeadersLibrary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mynativeheaders"], +} + cc_prebuilt_library_headers { name: "mynativeheaders", prefer: false, @@ -1870,6 +1998,15 @@ func TestSystemSharedLibPropagation(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: [ + "prebuilt_sslnil", + "prebuilt_sslempty", + "prebuilt_sslnonempty", + ], +} + cc_prebuilt_library_shared { name: "sslnil", prefer: false, @@ -1943,6 +2080,11 @@ cc_prebuilt_library_shared { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_sslvariants"], +} + cc_prebuilt_library_shared { name: "sslvariants", prefer: false, @@ -2002,6 +2144,11 @@ func TestStubsLibrary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_stubslib"], +} + cc_prebuilt_library_shared { name: "stubslib", prefer: false, @@ -2056,6 +2203,11 @@ func TestDeviceAndHostSnapshotWithStubsLibrary(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_stubslib"], +} + cc_prebuilt_library_shared { name: "stubslib", prefer: false, @@ -2114,6 +2266,11 @@ func TestUniqueHostSoname(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mylib"], +} + cc_prebuilt_library_shared { name: "mylib", prefer: false, @@ -2178,6 +2335,11 @@ func TestNoSanitizerMembers(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mynativelib"], +} + cc_prebuilt_library_shared { name: "mynativelib", prefer: false, -- cgit v1.2.3-59-g8ed1b