Merge "Make static library for loader tests"

This commit is contained in:
Treehugger Robot 2016-09-16 16:14:48 +00:00 committed by Gerrit Code Review
commit 9d4d60b480
1 changed files with 33 additions and 7 deletions

View File

@ -261,6 +261,37 @@ cc_test_library {
}, },
} }
cc_test_library {
name: "libBionicLoaderTests",
defaults: ["bionic_tests_defaults"],
srcs: [
"atexit_test.cpp",
"dl_test.cpp",
"dlfcn_test.cpp",
"pthread_dlfcn_test.cpp",
],
static_libs: [
"libbase",
],
include_dirs: [
"bionic/libc",
],
shared: {
enabled: false,
},
target: {
android: {
srcs: [
"dlext_test.cpp",
"libdl_test.cpp",
],
static_libs: [
"libpagemap",
],
}
}
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Library of bionic customized gtest main function, with normal gtest output format, // Library of bionic customized gtest main function, with normal gtest output format,
// which is needed by bionic cts test. // which is needed by bionic cts test.
@ -288,6 +319,7 @@ cc_defaults {
whole_static_libs: [ whole_static_libs: [
"libBionicTests", "libBionicTests",
"libBionicLoaderTests",
"libBionicGtestMain", "libBionicGtestMain",
], ],
@ -299,13 +331,7 @@ cc_defaults {
srcs: [ srcs: [
// TODO: Include __cxa_thread_atexit_test.cpp to glibc tests once it is upgraded (glibc 2.18+) // TODO: Include __cxa_thread_atexit_test.cpp to glibc tests once it is upgraded (glibc 2.18+)
"atexit_test.cpp",
"dl_test.cpp",
"dlext_test.cpp",
"__cxa_thread_atexit_test.cpp", "__cxa_thread_atexit_test.cpp",
"dlfcn_test.cpp",
"libdl_test.cpp",
"pthread_dlfcn_test.cpp",
"thread_local_test.cpp", "thread_local_test.cpp",
], ],
@ -322,7 +348,6 @@ cc_defaults {
android: { android: {
shared_libs: [ shared_libs: [
"libdl", "libdl",
"libpagemap",
"libdl_preempt_test_1", "libdl_preempt_test_1",
"libdl_preempt_test_2", "libdl_preempt_test_2",
"libdl_test_df_1_global", "libdl_test_df_1_global",
@ -330,6 +355,7 @@ cc_defaults {
static_libs: [ static_libs: [
// The order of these libraries matters, do not shuffle them. // The order of these libraries matters, do not shuffle them.
"libbase", "libbase",
"libpagemap",
"libziparchive", "libziparchive",
"libz", "libz",
"libutils", "libutils",