From 7070b7ac7448aea77e8ccb2047c323eacedca509 Mon Sep 17 00:00:00 2001
From: Ruchir Rastogi <ruchirr@google.com>
Date: Mon, 16 Dec 2019 13:45:13 -0800
Subject: [PATCH] Merge libstatspush_compat and libstatssocket_q

This cleanup makes it clear that there are only two acceptable ways of
logging to the socket: either through libstatspush_compat or
libstatssocket (which will soon be renamed to libstatspush).

Test: m -j
Change-Id: I6a49b4995b56df462e1be901ea5e54acfe2e8bac
---
 libstats/push_compat/Android.bp               | 11 +++--
 .../include/stats_event_list.h                |  0
 .../stats_event_list.c                        |  0
 .../{socket_q => push_compat}/statsd_writer.c |  0
 .../{socket_q => push_compat}/statsd_writer.h |  0
 libstats/socket_q/Android.bp                  | 40 -------------------
 6 files changed, 8 insertions(+), 43 deletions(-)
 rename libstats/{socket_q => push_compat}/include/stats_event_list.h (100%)
 rename libstats/{socket_q => push_compat}/stats_event_list.c (100%)
 rename libstats/{socket_q => push_compat}/statsd_writer.c (100%)
 rename libstats/{socket_q => push_compat}/statsd_writer.h (100%)
 delete mode 100644 libstats/socket_q/Android.bp

diff --git a/libstats/push_compat/Android.bp b/libstats/push_compat/Android.bp
index 93539903a..465c05a37 100644
--- a/libstats/push_compat/Android.bp
+++ b/libstats/push_compat/Android.bp
@@ -21,17 +21,22 @@
 // =========================================================================
 cc_defaults {
     name: "libstatspush_compat_defaults",
-    srcs: ["StatsEventCompat.cpp"],
+    srcs: [
+        "statsd_writer.c",
+        "stats_event_list.c",
+        "StatsEventCompat.cpp"
+    ],
     cflags: [
         "-Wall",
         "-Werror",
+        "-DWRITE_TO_STATSD=1",
+        "-DWRITE_TO_LOGD=0",
     ],
     header_libs: ["libstatssocket_headers"],
     static_libs: [
         "libbase",
         "liblog",
-        "libstatssocket_q",
-        "libutils"
+        "libutils",
     ],
 }
 
diff --git a/libstats/socket_q/include/stats_event_list.h b/libstats/push_compat/include/stats_event_list.h
similarity index 100%
rename from libstats/socket_q/include/stats_event_list.h
rename to libstats/push_compat/include/stats_event_list.h
diff --git a/libstats/socket_q/stats_event_list.c b/libstats/push_compat/stats_event_list.c
similarity index 100%
rename from libstats/socket_q/stats_event_list.c
rename to libstats/push_compat/stats_event_list.c
diff --git a/libstats/socket_q/statsd_writer.c b/libstats/push_compat/statsd_writer.c
similarity index 100%
rename from libstats/socket_q/statsd_writer.c
rename to libstats/push_compat/statsd_writer.c
diff --git a/libstats/socket_q/statsd_writer.h b/libstats/push_compat/statsd_writer.h
similarity index 100%
rename from libstats/socket_q/statsd_writer.h
rename to libstats/push_compat/statsd_writer.h
diff --git a/libstats/socket_q/Android.bp b/libstats/socket_q/Android.bp
deleted file mode 100644
index 6c0c65c23..000000000
--- a/libstats/socket_q/Android.bp
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright (C) 2018 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// ============================================================================
-// Native library to write stats log to statsd socket on Android Q and earlier.
-// This library is only meant to be used by libstatssocket_compat.
-// ============================================================================
-cc_library {
-    name: "libstatssocket_q",
-    srcs: [
-        "stats_event_list.c",
-        "statsd_writer.c",
-    ],
-    host_supported: true,
-    cflags: [
-        "-Wall",
-        "-Werror",
-        "-DLIBLOG_LOG_TAG=1006",
-        "-DWRITE_TO_STATSD=1",
-        "-DWRITE_TO_LOGD=0",
-    ],
-    export_include_dirs: ["include"],
-    shared_libs: [
-        "libcutils",
-        "liblog",
-    ],
-}