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

Merge "Add shared_libs to vendor and recovery targets." am: c51ffaf1f2

Browse Source 
am: fd845abe2a

Change-Id: Idf6fae21d0cd79dfb0976acb3ef3afc75ffae93d
This commit is contained in:
Martin Stjernholm
2018-11-08 03:16:29 -08:00
committed by android-build-merger
parent ba43629d2b fd845abe2a
commit 0ace3376ae
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/cc_test.go
View File

@@ -894,9 +894,7 @@ func TestVndkUseVndkExtError(t *testing.T) {
}
`)
// The pattern should be "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\""
// but target.vendor.shared_libs has not been supported yet.
testCcError(t, "unrecognized property \"target.vendor.shared_libs\"", `
testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
cc_library {
name: "libvndk",
vendor_available: true,
@@ -965,9 +963,7 @@ func TestVndkUseVndkExtError(t *testing.T) {
}
`)
// The pattern should be "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\""
// but target.vendor.shared_libs has not been supported yet.
testCcError(t, "unrecognized property \"target.vendor.shared_libs\"", `
testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
cc_library {
name: "libvndk_sp",
vendor_available: true,

10
cc/linker.go
View File

@@ -99,6 +99,10 @@ type BaseLinkerProperties struct {
Target struct {
Vendor struct {
// list of shared libs that only should be used to build the vendor
// variant of the C/C++ module.
Shared_libs []string
// list of shared libs that should not be used to build the vendor variant
// of the C/C++ module.
Exclude_shared_libs []string
@@ -116,6 +120,10 @@ type BaseLinkerProperties struct {
Exclude_runtime_libs []string
}
Recovery struct {
// list of shared libs that only should be used to build the recovery
// variant of the C/C++ module.
Shared_libs []string
// list of shared libs that should not be used to build
// the recovery variant of the C/C++ module.
Exclude_shared_libs []string
@@ -200,6 +208,7 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
}
if ctx.useVndk() {
deps.SharedLibs = append(deps.SharedLibs, linker.Properties.Target.Vendor.Shared_libs...)
deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Target.Vendor.Exclude_shared_libs)
deps.ReexportSharedLibHeaders = removeListFromList(deps.ReexportSharedLibHeaders, linker.Properties.Target.Vendor.Exclude_shared_libs)
deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Target.Vendor.Exclude_static_libs)
@@ -210,6 +219,7 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
}
if ctx.inRecovery() {
deps.SharedLibs = append(deps.SharedLibs, linker.Properties.Target.Recovery.Shared_libs...)
deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Target.Recovery.Exclude_shared_libs)
deps.ReexportSharedLibHeaders = removeListFromList(deps.ReexportSharedLibHeaders, linker.Properties.Target.Recovery.Exclude_shared_libs)
deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Target.Recovery.Exclude_static_libs)