StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target.apex.exclude_[shared|static]_libs to cc_* modules

Browse Source 
The property is used to exclude some shared and static libs when the
module is built for an APEX.

Bug: 166468760
Test: m
Change-Id: I0dcaa4ae94c01aa00dc5539c60d3054c57fd8824
This commit is contained in:
Jiyong Park
2020-12-03 17:28:25 +09:00
parent d348c41af5
commit e386754898
4 changed files with 102 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cc/linker.go
View File

@@ -174,6 +174,15 @@ type BaseLinkerProperties struct {
// variants.
Shared_libs []string
}
Apex struct {
// list of shared libs that should not be used to build the apex variant of
// the C/C++ module.
Exclude_shared_libs []string
// list of static libs that should not be used to build the apex ramdisk
// variant of the C/C++ module.
Exclude_static_libs []string
}
}
// make android::build:GetBuildNumber() available containing the build ID.
@@ -240,6 +249,16 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Exclude_static_libs)
deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Exclude_static_libs)
// Record the libraries that need to be excluded when building for APEX. Unlike other
// target.*.exclude_* properties, SharedLibs and StaticLibs are not modified here because
// this module hasn't yet passed the apexMutator. Therefore, we can't tell whether this is
// an apex variant of not. Record the exclude list in the deps struct for now. The info is
// used to mark the dependency tag when adding dependencies to the deps. Then inside
// GenerateAndroidBuildActions, the marked dependencies are ignored (i.e. not used) for APEX
// variants.
deps.ExcludeLibsForApex = append(deps.ExcludeLibsForApex, linker.Properties.Target.Apex.Exclude_shared_libs...)
deps.ExcludeLibsForApex = append(deps.ExcludeLibsForApex, linker.Properties.Target.Apex.Exclude_static_libs...)
if Bool(linker.Properties.Use_version_lib) {
deps.WholeStaticLibs = append(deps.WholeStaticLibs, "libbuildversion")
}