Move NDK test modules into cc/testing.go
Move the NDK modules defined in app_test.go into cc/testing.go in preparation for using sdk_version: "current" in more tests. Test: all soong tests Change-Id: I80bc31225fb4562fce42781219cefbbd6affae06
This commit is contained in:
@@ -1858,42 +1858,6 @@ func TestAndroidTestImport_NoJinUncompressForPresigned(t *testing.T) {
|
||||
|
||||
func TestStl(t *testing.T) {
|
||||
ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
|
||||
cc_library {
|
||||
name: "ndk_libunwind",
|
||||
sdk_version: "current",
|
||||
stl: "none",
|
||||
system_shared_libs: [],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libc.ndk.current",
|
||||
sdk_version: "current",
|
||||
stl: "none",
|
||||
system_shared_libs: [],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libm.ndk.current",
|
||||
sdk_version: "current",
|
||||
stl: "none",
|
||||
system_shared_libs: [],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libdl.ndk.current",
|
||||
sdk_version: "current",
|
||||
stl: "none",
|
||||
system_shared_libs: [],
|
||||
}
|
||||
|
||||
cc_object {
|
||||
name: "ndk_crtbegin_so.27",
|
||||
}
|
||||
|
||||
cc_object {
|
||||
name: "ndk_crtend_so.27",
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libjni",
|
||||
sdk_version: "current",
|
||||
@@ -1914,10 +1878,6 @@ func TestStl(t *testing.T) {
|
||||
compile_multilib: "both",
|
||||
sdk_version: "current",
|
||||
}
|
||||
|
||||
ndk_prebuilt_shared_stl {
|
||||
name: "ndk_libc++_shared",
|
||||
}
|
||||
`)
|
||||
|
||||
testCases := []struct {
|
||||
|
Reference in New Issue
Block a user