Merge "Move bionic test libraries to a default, for easy consumption in cts." into android14-tests-dev am: 430eb3e96b
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3394596
Change-Id: Ibb3814f9521a3a4bcc777a22d08e7708253e8120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/Android.bp b/tests/Android.bp
index 1be1ec3..30f52ca 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -866,79 +866,8 @@
],
}
-// -----------------------------------------------------------------------------
-// Tests for the device using bionic's .so. Run with:
-// adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests
-// adb shell /data/nativetest64/bionic-unit-tests/bionic-unit-tests
-// -----------------------------------------------------------------------------
cc_defaults {
- name: "bionic_unit_tests_defaults",
- host_supported: false,
- gtest: false,
-
- defaults: [
- "bionic_tests_defaults",
- ],
-
- whole_static_libs: [
- "libBionicTests",
- "libBionicLoaderTests",
- "libBionicElfTlsLoaderTests",
- ],
-
- static_libs: [
- "libtinyxml2",
- "liblog",
- "libbase",
- "libgtest_isolated",
- ],
-
- srcs: [
- // TODO: Include __cxa_thread_atexit_test.cpp to glibc tests once it is upgraded (glibc 2.18+)
- "__cxa_thread_atexit_test.cpp",
- "gtest_globals.cpp",
- "gtest_main.cpp",
- "gwp_asan_test.cpp",
- "thread_local_test.cpp",
- ],
-
- conlyflags: [
- "-fexceptions",
- "-fnon-call-exceptions",
- ],
-
- ldflags: ["-Wl,--export-dynamic"],
-
- include_dirs: ["bionic/libc"],
-
- stl: "libc++_static",
-
- target: {
- android: {
- shared_libs: [
- "ld-android",
- "libdl",
- "libdl_android",
- "libdl_preempt_test_1",
- "libdl_preempt_test_2",
- "libdl_test_df_1_global",
- "libtest_elftls_shared_var",
- "libtest_elftls_tprel",
- ],
- static_libs: [
- // The order of these libraries matters, do not shuffle them.
- "libmeminfo",
- "libziparchive",
- "libz",
- "libutils",
- ],
- ldflags: [
- "-Wl,--rpath,${ORIGIN}/bionic-loader-test-libs",
- "-Wl,--enable-new-dtags",
- ],
- },
- },
-
+ name: "bionic_unit_tests_data",
data_bins: [
"cfi_test_helper",
"cfi_test_helper2",
@@ -966,7 +895,6 @@
"thread_exit_cb_helper",
"tls_properties_helper",
],
-
data_libs: [
"libatest_simple_zip",
"libcfi-test",
@@ -1103,6 +1031,81 @@
],
}
+// -----------------------------------------------------------------------------
+// Tests for the device using bionic's .so. Run with:
+// adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests
+// adb shell /data/nativetest64/bionic-unit-tests/bionic-unit-tests
+// -----------------------------------------------------------------------------
+cc_defaults {
+ name: "bionic_unit_tests_defaults",
+ host_supported: false,
+ gtest: false,
+
+ defaults: [
+ "bionic_tests_defaults",
+ "bionic_unit_tests_data",
+ ],
+
+ whole_static_libs: [
+ "libBionicTests",
+ "libBionicLoaderTests",
+ "libBionicElfTlsLoaderTests",
+ ],
+
+ static_libs: [
+ "libtinyxml2",
+ "liblog",
+ "libbase",
+ "libgtest_isolated",
+ ],
+
+ srcs: [
+ // TODO: Include __cxa_thread_atexit_test.cpp to glibc tests once it is upgraded (glibc 2.18+)
+ "__cxa_thread_atexit_test.cpp",
+ "gtest_globals.cpp",
+ "gtest_main.cpp",
+ "gwp_asan_test.cpp",
+ "thread_local_test.cpp",
+ ],
+
+ conlyflags: [
+ "-fexceptions",
+ "-fnon-call-exceptions",
+ ],
+
+ ldflags: ["-Wl,--export-dynamic"],
+
+ include_dirs: ["bionic/libc"],
+
+ stl: "libc++_static",
+
+ target: {
+ android: {
+ shared_libs: [
+ "ld-android",
+ "libdl",
+ "libdl_android",
+ "libdl_preempt_test_1",
+ "libdl_preempt_test_2",
+ "libdl_test_df_1_global",
+ "libtest_elftls_shared_var",
+ "libtest_elftls_tprel",
+ ],
+ static_libs: [
+ // The order of these libraries matters, do not shuffle them.
+ "libmeminfo",
+ "libziparchive",
+ "libz",
+ "libutils",
+ ],
+ ldflags: [
+ "-Wl,--rpath,${ORIGIN}/bionic-loader-test-libs",
+ "-Wl,--enable-new-dtags",
+ ],
+ },
+ },
+}
+
cc_test {
name: "bionic-unit-tests",
defaults: [