summaryrefslogtreecommitdiff
path: root/cc/androidmk.go
diff options
context:
space:
mode:
author Spandan Das <spandandas@google.com> 2024-01-19 00:22:22 +0000
committer Spandan Das <spandandas@google.com> 2024-01-26 23:32:13 +0000
commit2b6dfb554d3332b26ef293b7c9618bbe4e47f20d (patch)
treea6999eabe82151464332443febd92f5f7ec90565 /cc/androidmk.go
parent1f4475cee17eca02464def554e5c924b14d18885 (diff)
Support mechanism to select a specific version of module sdk prebuilt
This CL is scoped to cc_* module types. With trunk stable, we will have multiple prebuilts of the cc modules in prebuilts/module_sdk/art/<v>/host-exports/, and this CL introduces a mechanism to use apex_contributions to select a specific versioned prebuilt when building. If a soong module is selected using apex_contributions, all rdeps will get that soong module, which includes - rdep soong modules which might be depending on it via Android.bp - Soong's rule builder HostToolPath API Implementation details: Create a new source_module_name property to identify the root module. rdeps referring to the root module will get redirected if necessary. This property also becomes the stem, if `stem` is not set explicitly. Bug: 322175508 Test: Added a unit test Change-Id: Ic8725602c81999621fcb33ce2a57fe4b9751baa8
Diffstat (limited to 'cc/androidmk.go')
-rw-r--r--cc/androidmk.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go
index fe542b05e..c39668c73 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -83,8 +83,9 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
// causing multiple ART APEXes (com.android.art and com.android.art.debug)
// to be installed. And this is breaking some older devices (like marlin)
// where system.img is small.
- Required: c.Properties.AndroidMkRuntimeLibs,
- Include: "$(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk",
+ Required: c.Properties.AndroidMkRuntimeLibs,
+ OverrideName: c.BaseModuleName(),
+ Include: "$(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk",
ExtraEntries: []android.AndroidMkExtraEntriesFunc{
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {