openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Snap for 7708232 from d50c559c57 to sc-d2-release 

Change-Id: I4c4fb1fdc2a12543e63049ec1e6c22f9e96aa4c5
This commit is contained in:
Android Build Coastguard Worker 2021-09-06 23:00:27 +00:00
parent fd4ab45d1d d50c559c57
commit d9a3d39a1f
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cc/linker.go
View File

@ -94,6 +94,9 @@ type BaseLinkerProperties struct {
// vendor variants and this module uses VNDK. // vendor variants and this module uses VNDK.
Runtime_libs []string `android:"arch_variant"` Runtime_libs []string `android:"arch_variant"`
// list of runtime libs that should not be installed along with this module.
Exclude_runtime_libs []string `android:"arch_variant"`
Target struct { Target struct {
Vendor, Product struct { Vendor, Product struct {
// list of shared libs that only should be used to build vendor or // list of shared libs that only should be used to build vendor or
@ -116,8 +119,8 @@ type BaseLinkerProperties struct {
// product variant of the C/C++ module. // product variant of the C/C++ module.
Exclude_header_libs []string Exclude_header_libs []string
// list of runtime libs that should not be installed along with // list of runtime libs that should not be installed along with the
// vendor or variant of the C/C++ module. // vendor or product variant of the C/C++ module.
Exclude_runtime_libs []string Exclude_runtime_libs []string
// version script for vendor or product variant // version script for vendor or product variant
@ -143,6 +146,10 @@ type BaseLinkerProperties struct {
// list of header libs that should not be used to build the recovery variant // list of header libs that should not be used to build the recovery variant
// of the C/C++ module. // of the C/C++ module.
Exclude_header_libs []string Exclude_header_libs []string
// list of runtime libs that should not be installed along with the
// recovery variant of the C/C++ module.
Exclude_runtime_libs []string
} }
Ramdisk struct { Ramdisk struct {
// list of static libs that only should be used to build the recovery // list of static libs that only should be used to build the recovery
@ -156,6 +163,10 @@ type BaseLinkerProperties struct {
// list of static libs that should not be used to build // list of static libs that should not be used to build
// the ramdisk variant of the C/C++ module. // the ramdisk variant of the C/C++ module.
Exclude_static_libs []string Exclude_static_libs []string
// list of runtime libs that should not be installed along with the
// ramdisk variant of the C/C++ module.
Exclude_runtime_libs []string
} }
Vendor_ramdisk struct { Vendor_ramdisk struct {
// list of shared libs that should not be used to build // list of shared libs that should not be used to build
@ -165,6 +176,10 @@ type BaseLinkerProperties struct {
// list of static libs that should not be used to build // list of static libs that should not be used to build
// the vendor ramdisk variant of the C/C++ module. // the vendor ramdisk variant of the C/C++ module.
Exclude_static_libs []string Exclude_static_libs []string
// list of runtime libs that should not be installed along with the
// vendor ramdisk variant of the C/C++ module.
Exclude_runtime_libs []string
} }
Platform struct { Platform struct {
// list of shared libs that should be use to build the platform variant // list of shared libs that should be use to build the platform variant
@ -178,7 +193,7 @@ type BaseLinkerProperties struct {
// the C/C++ module. // the C/C++ module.
Exclude_shared_libs []string Exclude_shared_libs []string
// list of static libs that should not be used to build the apex ramdisk // list of static libs that should not be used to build the apex
// variant of the C/C++ module. // variant of the C/C++ module.
Exclude_static_libs []string Exclude_static_libs []string
} }
@ -247,6 +262,7 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Exclude_shared_libs) deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Exclude_shared_libs)
deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Exclude_static_libs) deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Exclude_static_libs)
deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Exclude_static_libs) deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Exclude_static_libs)
deps.RuntimeLibs = removeListFromList(deps.RuntimeLibs, linker.Properties.Exclude_runtime_libs)
// Record the libraries that need to be excluded when building for APEX. Unlike other // 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 // target.*.exclude_* properties, SharedLibs and StaticLibs are not modified here because
@ -296,6 +312,7 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps.ReexportHeaderLibHeaders = removeListFromList(deps.ReexportHeaderLibHeaders, linker.Properties.Target.Recovery.Exclude_header_libs) deps.ReexportHeaderLibHeaders = removeListFromList(deps.ReexportHeaderLibHeaders, linker.Properties.Target.Recovery.Exclude_header_libs)
deps.ReexportStaticLibHeaders = removeListFromList(deps.ReexportStaticLibHeaders, linker.Properties.Target.Recovery.Exclude_static_libs) deps.ReexportStaticLibHeaders = removeListFromList(deps.ReexportStaticLibHeaders, linker.Properties.Target.Recovery.Exclude_static_libs)
deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Target.Recovery.Exclude_static_libs) deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Target.Recovery.Exclude_static_libs)
deps.RuntimeLibs = removeListFromList(deps.RuntimeLibs, linker.Properties.Target.Recovery.Exclude_runtime_libs)
} }
if ctx.inRamdisk() { if ctx.inRamdisk() {
@ -305,6 +322,7 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Target.Ramdisk.Exclude_static_libs) deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Target.Ramdisk.Exclude_static_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.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Target.Ramdisk.Exclude_static_libs)
deps.RuntimeLibs = removeListFromList(deps.RuntimeLibs, linker.Properties.Target.Ramdisk.Exclude_runtime_libs)
} }
if ctx.inVendorRamdisk() { if ctx.inVendorRamdisk() {
@ -313,6 +331,7 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Target.Vendor_ramdisk.Exclude_static_libs) deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Target.Vendor_ramdisk.Exclude_static_libs)
deps.ReexportStaticLibHeaders = removeListFromList(deps.ReexportStaticLibHeaders, linker.Properties.Target.Vendor_ramdisk.Exclude_static_libs) deps.ReexportStaticLibHeaders = removeListFromList(deps.ReexportStaticLibHeaders, linker.Properties.Target.Vendor_ramdisk.Exclude_static_libs)
deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Target.Vendor_ramdisk.Exclude_static_libs) deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Target.Vendor_ramdisk.Exclude_static_libs)
deps.RuntimeLibs = removeListFromList(deps.RuntimeLibs, linker.Properties.Target.Vendor_ramdisk.Exclude_runtime_libs)
} }
if !ctx.useSdk() { if !ctx.useSdk() {