diff options
Diffstat (limited to 'cc/linker.go')
| -rw-r--r-- | cc/linker.go | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/cc/linker.go b/cc/linker.go index 88619f392..d39ef5e8c 100644 --- a/cc/linker.go +++ b/cc/linker.go @@ -152,7 +152,11 @@ type BaseLinkerProperties struct { Exclude_runtime_libs []string } Ramdisk struct { - // list of static libs that only should be used to build the recovery + // list of shared libs that only should be used to build the ramdisk + // variant of the C/C++ module. + Shared_libs []string + + // list of static libs that only should be used to build the ramdisk // variant of the C/C++ module. Static_libs []string @@ -167,10 +171,14 @@ type BaseLinkerProperties struct { // list of runtime libs that should not be installed along with the // ramdisk variant of the C/C++ module. Exclude_runtime_libs []string + + // list of header libs that should not be used to build the ramdisk variant + // of the C/C++ module. + Exclude_header_libs []string } Vendor_ramdisk struct { // list of shared libs that should not be used to build - // the recovery variant of the C/C++ module. + // the vendor ramdisk variant of the C/C++ module. Exclude_shared_libs []string // list of static libs that should not be used to build @@ -316,10 +324,13 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { } if ctx.inRamdisk() { + deps.SharedLibs = append(deps.SharedLibs, linker.Properties.Target.Ramdisk.Shared_libs...) deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Target.Ramdisk.Exclude_shared_libs) deps.ReexportSharedLibHeaders = removeListFromList(deps.ReexportSharedLibHeaders, linker.Properties.Target.Ramdisk.Exclude_shared_libs) deps.StaticLibs = append(deps.StaticLibs, linker.Properties.Target.Ramdisk.Static_libs...) deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Target.Ramdisk.Exclude_static_libs) + deps.HeaderLibs = removeListFromList(deps.HeaderLibs, linker.Properties.Target.Ramdisk.Exclude_header_libs) + deps.ReexportStaticLibHeaders = removeListFromList(deps.ReexportStaticLibHeaders, linker.Properties.Target.Ramdisk.Exclude_static_libs) deps.ReexportStaticLibHeaders = removeListFromList(deps.ReexportStaticLibHeaders, linker.Properties.Target.Ramdisk.Exclude_static_libs) deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Target.Ramdisk.Exclude_static_libs) deps.RuntimeLibs = removeListFromList(deps.RuntimeLibs, linker.Properties.Target.Ramdisk.Exclude_runtime_libs) |