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/sdk_test.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'sdk/sdk_test.go') diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go index c4df146b6..f9d49d98d 100644 --- a/sdk/sdk_test.go +++ b/sdk/sdk_test.go @@ -118,6 +118,16 @@ func TestSnapshotVisibility(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: [ + "prebuilt_myjavalib", + "prebuilt_mypublicjavalib", + "prebuilt_mydefaultedjavalib", + "prebuilt_myprivatejavalib", + ], +} + java_import { name: "myjavalib", prefer: false, @@ -398,6 +408,11 @@ func TestSnapshot_EnvConfiguration(t *testing.T) { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_myjavalib"], +} + java_import { name: "myjavalib", prefer: false, @@ -453,6 +468,11 @@ java_import { checkAndroidBpContents(` // This is auto-generated. DO NOT EDIT. +apex_contributions_defaults { + name: "mysdk.contributions", + contents: ["prebuilt_mysdklibrary"], +} + prebuilt_bootclasspath_fragment { name: "mybootclasspathfragment", prefer: false, -- cgit v1.2.3-59-g8ed1b