Remove statsd static test libs

Remove libstatspull_private and libstatssocket_private.
Make statsd-aidl only available in statsd apex.

Test: Treehugger
Test: m
Test: atest statsd_test
Test: atest statsd_benchmark
Test: atest LibStatsPullTests
Test: atest libstatspull_test
Test: atest libstatssocket_test
Bug: 161575591

Change-Id: I544c89f4e9d2cecb227534a43d5600c183b467be

5 files changed, 12 insertions, 40 deletions

diff --git a/apex/tests/libstatspull/Android.bp b/apex/tests/libstatspull/Android.bp
index c3473e3d..d3079e00 100644
--- a/apex/tests/libstatspull/Android.bp
+++ b/apex/tests/libstatspull/Android.bp
@@ -45,7 +45,7 @@ android_test {
     compile_multilib: "both",
 }
 
-cc_library_shared {
+cc_test_library {
     name: "libstatspull_testhelper",
     srcs: ["jni/stats_pull_helper.cpp"],
     cflags: [
@@ -54,12 +54,12 @@ cc_library_shared {
         "-Wthread-safety",
     ],
     shared_libs: [
-        "libbinder_ndk",
-        "statsd-aidl-ndk",
+        "libstatspull",
+        "libstatssocket",
     ],
+    header_libs: ["libnativehelper_header_only"],
     static_libs: [
         "libbase",
-        "libstatspull_private",
-        "libstatssocket_private",
     ],
+    test_for: ["com.android.os.statsd"],
 }
diff --git a/lib/libstatspull/Android.bp b/lib/libstatspull/Android.bp
index d10e7e35..28c0a706 100644
--- a/lib/libstatspull/Android.bp
+++ b/lib/libstatspull/Android.bp
@@ -77,20 +77,6 @@ cc_library_headers {
     export_include_dirs: ["include"],
 }
 
-// ONLY USE IN TESTS.
-cc_library_static {
-    name: "libstatspull_private",
-    defaults: [
-        "libstatspull_defaults",
-    ],
-    cflags: [
-        "-DLIB_STATS_PULL_TESTS_FLAG",
-    ],
-    visibility: [
-        "//packages/modules/StatsD/apex/tests/libstatspull",
-    ],
-}
-
 // Note: These unit tests only test PullAtomMetadata and subscriptions
 // For full E2E tests of pullers, use LibStatsPullTests
 cc_test {
@@ -152,4 +138,5 @@ cc_test {
     ],
     require_root: true,
     min_sdk_version: "30",
+    test_for: ["com.android.os.statsd"],
 }
diff --git a/lib/libstatspull/stats_pull_atom_callback.cpp b/lib/libstatspull/stats_pull_atom_callback.cpp
index b3194c71..b880f0a8 100644
--- a/lib/libstatspull/stats_pull_atom_callback.cpp
+++ b/lib/libstatspull/stats_pull_atom_callback.cpp
@@ -121,8 +121,6 @@ class StatsPullAtomCallbackInternal : public BnPullAtomCallback {
         // Convert stats_events into StatsEventParcels.
         std::vector<StatsEventParcel> parcels;
 
-        // Resolves fuzz build failure in b/161575591.
-#if defined(__ANDROID_APEX__) || defined(LIB_STATS_PULL_TESTS_FLAG)
         for (int i = 0; i < statsEventList.data.size(); i++) {
             size_t size;
             uint8_t* buffer = AStatsEvent_getBuffer(statsEventList.data[i], &size);
@@ -133,7 +131,6 @@ class StatsPullAtomCallbackInternal : public BnPullAtomCallback {
             p.buffer.assign(buffer, buffer + size);
             parcels.push_back(std::move(p));
         }
-#endif
 
         Status status = resultReceiver->pullFinished(atomTag, success, parcels);
         if (!status.isOk()) {
diff --git a/lib/libstatssocket/Android.bp b/lib/libstatssocket/Android.bp
index 85d6d69b..fce6a757 100644
--- a/lib/libstatssocket/Android.bp
+++ b/lib/libstatssocket/Android.bp
@@ -74,18 +74,6 @@ cc_library_shared {
     min_sdk_version: "30",
 }
 
-//TODO (b/149842105): Figure out if there is a better solution for this.
-cc_test_library {
-    name: "libstatssocket_private",
-    defaults: [
-        "libstatssocket_defaults",
-    ],
-    visibility: [
-        "//packages/modules/StatsD/apex/tests/libstatspull",
-        "//packages/modules/StatsD/statsd",
-    ],
-}
-
 cc_library_headers {
     name: "libstatssocket_headers",
     export_include_dirs: ["include"],
@@ -114,10 +102,10 @@ cc_test {
     static_libs: [
         "libbase",
         "libgmock",
-        "libstatssocket_private",
     ],
     shared_libs: [
         "libutils",
+        "libstatssocket",
     ],
     test_suites: [
         "device-tests",
@@ -137,6 +125,7 @@ cc_test {
     },
     require_root: true,
     min_sdk_version: "30",
+    test_for: ["com.android.os.statsd"],
 }
 
 genrule {
diff --git a/statsd/Android.bp b/statsd/Android.bp
index 1b410ea9..2199a5cb 100644
--- a/statsd/Android.bp
+++ b/statsd/Android.bp
@@ -150,6 +150,7 @@ cc_defaults {
         "libbinder_ndk",
         "libincident",
         "liblog",
+        "libstatssocket",
     ],
     header_libs: [
         "libgtest_prod_headers",
@@ -263,10 +264,6 @@ cc_binary {
     },
     stl: "libc++_static",
 
-    shared_libs: [
-        "libstatssocket",
-    ],
-
     apex_available: [
         "com.android.os.statsd",
         "test_com.android.os.statsd",
@@ -298,7 +295,6 @@ cc_defaults {
     static_libs: [
         "libgmock",
         "libstatslog_statsdtest",
-        "libstatssocket_private",
     ],
     proto: {
         type: "lite",
@@ -459,6 +455,7 @@ cc_test {
     ],
 
     min_sdk_version: "30",
+    test_for: ["com.android.os.statsd"],
 }
 
 //#############################
@@ -494,6 +491,8 @@ cc_benchmark {
         "libgtest",
         "libstats_test_utils",
     ],
+
+    test_for: ["com.android.os.statsd"],
 }
 
 // ====  java proto device library (for test only)  ==============================