diff options
Diffstat (limited to 'tests/Android.bp')
| -rw-r--r-- | tests/Android.bp | 130 |
1 files changed, 24 insertions, 106 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index a54ffb835..476b8f5fb 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -62,10 +62,7 @@ cc_defaults { // For glibc. "-D__STDC_LIMIT_MACROS", ], - header_libs: [ - "libcutils_headers", - "gwp_asan_headers" - ], + header_libs: ["libcutils_headers"], // Ensure that the tests exercise shadow call stack support and // the hint space PAC/BTI instructions. arch: { @@ -298,29 +295,6 @@ cc_prebuilt_test_library_shared { }, } -cc_prebuilt_test_library_shared { - name: "libtest_invalid-local-tls", - strip: { - none: true, - }, - check_elf_files: false, - relative_install_path: "bionic-loader-test-libs/prebuilt-elf-files", - arch: { - arm: { - srcs: ["prebuilt-elf-files/arm/libtest_invalid-local-tls.so"], - }, - arm64: { - srcs: ["prebuilt-elf-files/arm64/libtest_invalid-local-tls.so"], - }, - x86: { - srcs: ["prebuilt-elf-files/x86/libtest_invalid-local-tls.so"], - }, - x86_64: { - srcs: ["prebuilt-elf-files/x86_64/libtest_invalid-local-tls.so"], - }, - }, -} - // ----------------------------------------------------------------------------- // All standard tests. // ----------------------------------------------------------------------------- @@ -346,7 +320,6 @@ cc_test_library { "__cxa_demangle_test.cpp", "alloca_test.cpp", "android_get_device_api_level.cpp", - "android_set_abort_message_test.cpp", "arpa_inet_test.cpp", "async_safe_test.cpp", "assert_test.cpp", @@ -433,7 +406,6 @@ cc_test_library { "string_nofortify_test.cpp", "string_test.cpp", "string_posix_strerror_r_test.cpp", - "string_posix_strerror_r_wrapper.cpp", "strings_nofortify_test.cpp", "strings_test.cpp", "struct_layout_test.cpp", @@ -496,18 +468,6 @@ cc_test_library { "libsystemproperties", ], }, - musl: { - exclude_srcs: [ - // musl doesn't have error.h - "error_test.cpp", - - // musl doesn't define noreturn for C++ - "stdnoreturn_test.cpp", - - // unsupported relocation type 37 - "ifunc_test.cpp", - ], - }, }, static_libs: [ @@ -520,12 +480,6 @@ cc_test_library { }, generated_headers: ["generated_android_ids"], - - // Bug: http://b/218788252 IR verifier too strict for ifunc resolver that - // accept parameters. - lto: { - never: true, - }, } cc_test_library { @@ -598,18 +552,6 @@ cc_test_library { ], } -cc_test_library { - name: "libBionicGwpAsanTests", - defaults: ["bionic_tests_defaults"], - srcs: [ - "gwp_asan_test.cpp", - ], - include_dirs: [ - "bionic/libc", - ], - static_libs: ["libbase"], -} - // ----------------------------------------------------------------------------- // Fortify tests. // ----------------------------------------------------------------------------- @@ -644,10 +586,6 @@ cc_defaults { host: { clang_cflags: ["-D__clang__"], }, - musl: { - // Musl doesn't have fortify - enabled: false, - }, }, } @@ -769,12 +707,10 @@ cc_test_library { cc_test_library { name: "libBionicTests", defaults: ["bionic_tests_defaults"], - host_supported: false, whole_static_libs: [ "libBionicStandardTests", "libBionicElfTlsTests", "libBionicFramePointerTests", - "libBionicGwpAsanTests", "libfortify1-tests-clang", "libfortify1-new-tests-clang", "libfortify2-tests-clang", @@ -789,13 +725,13 @@ cc_test_library { name: "libBionicLoaderTests", defaults: [ "bionic_tests_defaults", + "llvm-defaults", ], srcs: [ "atexit_test.cpp", "dl_test.cpp", "dlfcn_symlink_support.cpp", "dlfcn_test.cpp", - "execinfo_test.cpp", "link_test.cpp", "pthread_dlfcn_test.cpp", ], @@ -819,6 +755,12 @@ cc_test_library { "libmeminfo", "libprocinfo", "libziparchive", + "libLLVMObject", + "libLLVMBitReader", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMCore", + "libLLVMSupport", ], }, }, @@ -832,14 +774,13 @@ cc_test_library { name: "libBionicCtsGtestMain", defaults: ["bionic_tests_defaults"], srcs: [ - "gtest_globals.cpp", + "gtest_globals_cts.cpp", "gtest_main.cpp", ], shared: { enabled: false, }, whole_static_libs: [ - "libbase", "libgtest_isolated", ], } @@ -908,15 +849,21 @@ cc_defaults { "libziparchive", "libz", "libutils", + "libLLVMObject", + "libLLVMBitReader", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMCore", + "libLLVMSupport", ], ldflags: [ - "-Wl,--rpath,${ORIGIN}/bionic-loader-test-libs", + "-Wl,--rpath,${ORIGIN}/../bionic-loader-test-libs", "-Wl,--enable-new-dtags", ], }, }, - data_bins: [ + required: [ "cfi_test_helper", "cfi_test_helper2", "elftls_dlopen_ie_error_helper", @@ -935,14 +882,6 @@ cc_defaults { "ld_preload_test_helper", "ld_preload_test_helper_lib1", "ld_preload_test_helper_lib2", - "ns_hidden_child_helper", - "preinit_getauxval_test_helper", - "preinit_syscall_test_helper", - "thread_exit_cb_helper", - "tls_properties_helper", - ], - - data_libs: [ "libatest_simple_zip", "libcfi-test", "libcfi-test-bad", @@ -954,7 +893,9 @@ cc_defaults { "libdlext_test_fd", "libdlext_test_norelro", "libdlext_test_recursive", + "libdlext_test_runpath_zip_zipaligned", "libdlext_test_zip", + "libdlext_test_zip_zipaligned", "libgnu-hash-table-library", "libns_hidden_child_app", "libns_hidden_child_global", @@ -1034,7 +975,6 @@ cc_defaults { "libtest_init_fini_order_root", "libtest_init_fini_order_root2", "libtest_invalid-empty_shdr_table", - "libtest_invalid-local-tls", "libtest_invalid-rw_load_segment", "libtest_invalid-textrels", "libtest_invalid-textrels2", @@ -1075,6 +1015,11 @@ cc_defaults { "libtest_with_dependency_loop_b", "libtest_with_dependency_loop_c", "libtestshared", + "ns_hidden_child_helper", + "preinit_getauxval_test_helper", + "preinit_syscall_test_helper", + "thread_exit_cb_helper", + "tls_properties_helper", ], } @@ -1083,11 +1028,6 @@ cc_test { defaults: [ "bionic_unit_tests_defaults", ], - test_suites: ["device-tests"], - data: [ - ":libdlext_test_runpath_zip_zipaligned", - ":libdlext_test_zip_zipaligned", - ], } cc_test { @@ -1130,7 +1070,6 @@ cc_test { name: "bionic-unit-tests-static", gtest: false, defaults: ["bionic_tests_defaults"], - test_suites: ["device-tests"], host_supported: false, srcs: [ @@ -1164,19 +1103,6 @@ cc_test { static_executable: true, stl: "libc++_static", - // Clang cannot build ifunc with LTO. - // http://b/203737712 - lto: { - never: true, - }, - data_bins: [ - "heap_tagging_async_helper", - "heap_tagging_disabled_helper", - "heap_tagging_static_async_helper", - "heap_tagging_static_disabled_helper", - "heap_tagging_static_sync_helper", - "heap_tagging_sync_helper", - ], } // ----------------------------------------------------------------------------- @@ -1194,7 +1120,6 @@ cc_test_host { "dlfcn_symlink_support.cpp", "dlfcn_test.cpp", "dl_test.cpp", - "execinfo_test.cpp", "gtest_globals.cpp", "gtest_main.cpp", "pthread_dlfcn_test.cpp", @@ -1245,13 +1170,6 @@ cc_test_host { linux_bionic: { enabled: false, }, - musl: { - exclude_static_libs: [ - // Musl doesn't have fortify - "libfortify1-tests-clang", - "libfortify2-tests-clang", - ], - }, }, } |