Merge "Move off test_per_src." into main am: 2bfc7697ae am: 8c088448fa am: 72634bcb35

Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/2769130

Change-Id: Ib0244a1a0958eb3f6406d5bfadbbb52b41612f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 70 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 37d6227f..258a027c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -86,25 +86,80 @@ cc_library {
 }
 
 //
-// Tests.
+// Tests (but not _unit_ tests).
+//
+// It's unlikely anyone's running these manually, but at least compiling them
+// shows we can compile libpcap callers...
 //
 
 cc_test {
-    name: "libpcap_test",
+    name: "libpcap_can_set_rfmon_test",
     defaults: ["libpcap_defaults"],
     gtest: false,
-    // (Matches order in libpcap's Makefile.)
-    srcs: [
-        "testprogs/can_set_rfmon_test.c",
-        "testprogs/capturetest.c",
-        "testprogs/filtertest.c",
-        "testprogs/findalldevstest.c",
-        "testprogs/opentest.c",
-        "testprogs/reactivatetest.c",
-        "testprogs/selpolltest.c",
-        "testprogs/threadsignaltest.c",
-        "testprogs/valgrindtest.c",
-    ],
+    srcs: ["testprogs/can_set_rfmon_test.c"],
+    static_libs: ["libpcap"],
+}
+
+cc_test {
+    name: "libpcap_capture_test",
+    defaults: ["libpcap_defaults"],
+    gtest: false,
+    srcs: ["testprogs/capturetest.c"],
+    static_libs: ["libpcap"],
+}
+
+cc_test {
+    name: "libpcap_filter_test",
+    defaults: ["libpcap_defaults"],
+    gtest: false,
+    srcs: ["testprogs/filtertest.c"],
+    static_libs: ["libpcap"],
+}
+
+cc_test {
+    name: "libpcap_findalldevs_test",
+    defaults: ["libpcap_defaults"],
+    gtest: false,
+    srcs: ["testprogs/findalldevstest.c"],
+    static_libs: ["libpcap"],
+}
+
+cc_test {
+    name: "libpcap_open_test",
+    defaults: ["libpcap_defaults"],
+    gtest: false,
+    srcs: ["testprogs/opentest.c"],
+    static_libs: ["libpcap"],
+}
+
+cc_test {
+    name: "libpcap_reactivate_test",
+    defaults: ["libpcap_defaults"],
+    gtest: false,
+    srcs: ["testprogs/reactivatetest.c"],
+    static_libs: ["libpcap"],
+}
+
+cc_test {
+    name: "libpcap_selpoll_test",
+    defaults: ["libpcap_defaults"],
+    gtest: false,
+    srcs: ["testprogs/selpolltest.c"],
+    static_libs: ["libpcap"],
+}
+
+cc_test {
+    name: "libpcap_threadsignal_test",
+    defaults: ["libpcap_defaults"],
+    gtest: false,
+    srcs: ["testprogs/threadsignaltest.c"],
+    static_libs: ["libpcap"],
+}
+
+cc_test {
+    name: "libpcap_valgrind_test",
+    defaults: ["libpcap_defaults"],
+    gtest: false,
+    srcs: ["testprogs/valgrindtest.c"],
     static_libs: ["libpcap"],
-    test_per_src: true,
 }