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

Remove default_shared_libs

Browse Source 
system_shared_libs has been modified to have the same behavior as
the newly added default_shared_libs, remove default_shared_libs in
favor of system_shared_libs.

This reverts Ia2349d84c70e503916f90a5d2702e135248f73df and renames
the default_shared_libs property in cc_object (which never had
system_shared_libs) to system_shared_libs.

Bug: 193559105
Test: m checkbuild
Change-Id: I46672e3a096b6ea94ff4c10e1c31e8fd010a163c
This commit is contained in:
Colin Cross
2021-07-22 11:39:44 -07:00
parent 72bf8e1310
commit 6b8f4253eb
8 changed files with 37 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bp2build/cc_object_conversion_test.go
View File

@@ -46,7 +46,7 @@ func TestCcObjectSimple(t *testing.T) {
blueprint: `cc_object {
name: "foo",
local_include_dirs: ["include"],
default_shared_libs: [],
system_shared_libs: [],
cflags: [
"-Wno-gcc-compat",
"-Wall",
@@ -84,7 +84,7 @@ func TestCcObjectDefaults(t *testing.T) {
moduleTypeUnderTestBp2BuildMutator: cc.ObjectBp2Build,
blueprint: `cc_object {
name: "foo",
default_shared_libs: [],
system_shared_libs: [],
local_include_dirs: ["include"],
srcs: [
"a/b/*.h",
@@ -137,14 +137,14 @@ func TestCcObjectCcObjetDepsInObjs(t *testing.T) {
},
blueprint: `cc_object {
name: "foo",
default_shared_libs: [],
system_shared_libs: [],
srcs: ["a/b/c.c"],
objs: ["bar"],
}
cc_object {
name: "bar",
default_shared_libs: [],
system_shared_libs: [],
srcs: ["x/y/z.c"],
}
`,
@@ -182,7 +182,7 @@ func TestCcObjectIncludeBuildDirFalse(t *testing.T) {
},
blueprint: `cc_object {
name: "foo",
default_shared_libs: [],
system_shared_libs: [],
srcs: ["a/b/c.c"],
include_build_directory: false,
}
@@ -204,7 +204,7 @@ func TestCcObjectProductVariable(t *testing.T) {
moduleTypeUnderTestBp2BuildMutator: cc.ObjectBp2Build,
blueprint: `cc_object {
name: "foo",
default_shared_libs: [],
system_shared_libs: [],
include_build_directory: false,
product_variables: {
platform_sdk_version: {
@@ -233,7 +233,7 @@ func TestCcObjectCflagsOneArch(t *testing.T) {
moduleTypeUnderTestBp2BuildMutator: cc.ObjectBp2Build,
blueprint: `cc_object {
name: "foo",
default_shared_libs: [],
system_shared_libs: [],
srcs: ["a.cpp"],
arch: {
x86: {
@@ -273,7 +273,7 @@ func TestCcObjectCflagsFourArch(t *testing.T) {
moduleTypeUnderTestBp2BuildMutator: cc.ObjectBp2Build,
blueprint: `cc_object {
name: "foo",
default_shared_libs: [],
system_shared_libs: [],
srcs: ["base.cpp"],
arch: {
x86: {
@@ -329,7 +329,7 @@ func TestCcObjectCflagsMultiOs(t *testing.T) {
moduleTypeUnderTestBp2BuildMutator: cc.ObjectBp2Build,
blueprint: `cc_object {
name: "foo",
default_shared_libs: [],
system_shared_libs: [],
srcs: ["base.cpp"],
target: {
android: {