commit d87589549ff62de28cced0b9d7207f7613afce43
author Tej Singh <singhtejinder@google.com> Tue Feb 18 17:59:31 2020 -0800
committer Tej Singh <singhtejinder@google.com> Tue Feb 18 18:32:56 2020 -0800
tree a219d2c46c9101b72bef015ea5b8ae66e4f5746c
parent 4ef4b08659a19fc554b49d3c7cfec3f11c1dc62f

Turn off cpp aidlgen, link libstatssocket as share

Test: make
Change-Id: I052fa53544e47eff6d1d8f409b62569e3d59fd04

apex/statsd/aidl/Android.bp

diff --git a/apex/statsd/aidl/Android.bp b/apex/statsd/aidl/Android.bp
index 7c93bc7..f7a8176 100644
--- a/apex/statsd/aidl/Android.bp
+++ b/apex/statsd/aidl/Android.bp
@@ -34,7 +34,7 @@
             enabled: false, // the platform uses statsd_java_aidl
         },
         cpp: {
-            enabled: true,
+            enabled: false,
         },
         ndk: {
             enabled: true,

tools/stats_log_api_gen/Android.bp

diff --git a/tools/stats_log_api_gen/Android.bp b/tools/stats_log_api_gen/Android.bp
index e566d27..d5031d7 100644
--- a/tools/stats_log_api_gen/Android.bp
+++ b/tools/stats_log_api_gen/Android.bp
@@ -121,9 +121,8 @@
     shared_libs: [
         "liblog",
         "libcutils",
+        "libstatssocket",
     ],
-    static_libs: ["libstatssocket"],
-
     apex_available: [
         "//apex_available:platform",
         //TODO(b/149781190): Remove this once statsd no longer depends on libstatslog