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

Merge changes from topic "soong_tests_ndk" am: 53fe467c67 am: 563533c0e6

Browse Source 
Change-Id: I0e2cbd23cf3471129102c850c987a6c9f20590a2
This commit is contained in:
Automerger Merge Worker
2020-02-20 21:23:29 +00:00
parent 09bb178aea 563533c0e6
commit 56f90a17fe
5 changed files with 63 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/cc_test.go
View File

@@ -2674,20 +2674,20 @@ func TestStaticDepsOrderWithStubs(t *testing.T) {
cc_binary {
name: "mybin",
srcs: ["foo.c"],
static_libs: ["libB"],
static_libs: ["libfooB"],
static_executable: true,
stl: "none",
}
cc_library {
name: "libB",
name: "libfooB",
srcs: ["foo.c"],
shared_libs: ["libC"],
shared_libs: ["libfooC"],
stl: "none",
}
cc_library {
name: "libC",
name: "libfooC",
srcs: ["foo.c"],
stl: "none",
stubs: {
@@ -2697,7 +2697,7 @@ func TestStaticDepsOrderWithStubs(t *testing.T) {
mybin := ctx.ModuleForTests("mybin", "android_arm64_armv8-a").Module().(*Module)
actual := mybin.depsInLinkOrder
expected := getOutputPaths(ctx, "android_arm64_armv8-a_static", []string{"libB", "libC"})
expected := getOutputPaths(ctx, "android_arm64_armv8-a_static", []string{"libfooB", "libfooC"})
if !reflect.DeepEqual(actual, expected) {
t.Errorf("staticDeps orderings were not propagated correctly"+

35
cc/testing.go
View File

@@ -39,6 +39,7 @@ func GatherRequiredDepsForTest(os android.OsType) string {
name: "libatomic",
vendor_available: true,
recovery_available: true,
native_bridge_supported: true,
src: "",
}
@@ -53,6 +54,7 @@ func GatherRequiredDepsForTest(os android.OsType) string {
name: "libclang_rt.builtins-arm-android",
vendor_available: true,
recovery_available: true,
native_bridge_supported: true,
src: "",
}
@@ -60,6 +62,7 @@ func GatherRequiredDepsForTest(os android.OsType) string {
name: "libclang_rt.builtins-aarch64-android",
vendor_available: true,
recovery_available: true,
native_bridge_supported: true,
src: "",
}
@@ -67,6 +70,7 @@ func GatherRequiredDepsForTest(os android.OsType) string {
name: "libclang_rt.builtins-i686-android",
vendor_available: true,
recovery_available: true,
native_bridge_supported: true,
src: "",
}
@@ -74,6 +78,7 @@ func GatherRequiredDepsForTest(os android.OsType) string {
name: "libclang_rt.builtins-x86_64-android",
vendor_available: true,
recovery_available: true,
native_bridge_supported: true,
src: "",
}
@@ -117,6 +122,7 @@ func GatherRequiredDepsForTest(os android.OsType) string {
name: "libclang_rt.ubsan_standalone-aarch64-android",
vendor_available: true,
recovery_available: true,
system_shared_libs: [],
srcs: [""],
}
@@ -141,6 +147,9 @@ func GatherRequiredDepsForTest(os android.OsType) string {
stl: "none",
system_shared_libs: [],
recovery_available: true,
stubs: {
versions: ["27", "28", "29"],
},
}
llndk_library {
name: "libc",
@@ -153,6 +162,13 @@ func GatherRequiredDepsForTest(os android.OsType) string {
stl: "none",
system_shared_libs: [],
recovery_available: true,
stubs: {
versions: ["27", "28", "29"],
},
apex_available: [
"//apex_available:platform",
"myapex"
],
}
llndk_library {
name: "libm",
@@ -165,6 +181,13 @@ func GatherRequiredDepsForTest(os android.OsType) string {
stl: "none",
system_shared_libs: [],
recovery_available: true,
stubs: {
versions: ["27", "28", "29"],
},
apex_available: [
"//apex_available:platform",
"myapex"
],
}
llndk_library {
name: "libdl",
@@ -203,6 +226,10 @@ func GatherRequiredDepsForTest(os android.OsType) string {
enabled: true,
support_system_process: true,
},
apex_available: [
"//apex_available:platform",
"myapex"
],
}
cc_library {
name: "libc++demangle",
@@ -228,6 +255,7 @@ func GatherRequiredDepsForTest(os android.OsType) string {
name: "crtbegin_so",
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,
stl: "none",
}
@@ -235,18 +263,23 @@ func GatherRequiredDepsForTest(os android.OsType) string {
name: "crtbegin_dynamic",
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,
stl: "none",
}
cc_object {
name: "crtbegin_static",
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,
stl: "none",
}
cc_object {
name: "crtend_so",
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,
stl: "none",
}
@@ -254,6 +287,8 @@ func GatherRequiredDepsForTest(os android.OsType) string {
name: "crtend_android",
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,
stl: "none",
}
cc_library {