commit f39f44de54e9ea4696a33cab11014a1afc57534e
author Ruchir Rastogi <ruchirr@google.com> Fri Jan 31 12:29:32 2020 -0800
committer Jeffrey Huang <jeffreyhuang@google.com> Fri Feb 07 15:40:24 2020 -0800
tree aa439d5c6768073426b06c6590562350653c1c5b
parent 3d986afddebd1fe6b91ff9e16432a783fc08989b

Use cpp aidl_interface within statsd

This CL is part of a larger effort to shift statsd to libbinder_ndk.
This CL specifically accomplishes the following:
    - constructs an aidl_interface soong module that can be used by statsd
      and libstatspull
    - defines the parameters of StatsDimensionsValueParcel
      (conversions to and from StatsDimensionsValueParcel are not yet defined,
      so this CL will break sendSubscriberBroadcast. A later CL will fix this
      issue...)

Test: m -j
Bug: 148682447
Change-Id: I7afa3e21d4c9fc1970e6c393204e1bdb110760fb

bin/Android.bp

diff --git a/bin/Android.bp b/bin/Android.bp
index 70f309a..c8aae7b 100644
--- a/bin/Android.bp
+++ b/bin/Android.bp
@@ -44,12 +44,8 @@
 
 cc_defaults {
     name: "statsd_defaults",
-    aidl: {
-        include_dirs: ["frameworks/base/core/java"],
-    },
 
     srcs: [
-        ":statsd_aidl",
         "src/active_config_list.proto",
         "src/anomaly/AlarmMonitor.cpp",
         "src/anomaly/AlarmTracker.cpp",
@@ -132,6 +128,7 @@
         "liblog",
         "libservices",
         "libstatssocket",
+        "statsd-aidl-cpp",
     ],
 }
 

bin/src/subscriber/SubscriberReporter.cpp

diff --git a/bin/src/subscriber/SubscriberReporter.cpp b/bin/src/subscriber/SubscriberReporter.cpp
index 160b57e..2ddecc7 100644
--- a/bin/src/subscriber/SubscriberReporter.cpp
+++ b/bin/src/subscriber/SubscriberReporter.cpp
@@ -115,13 +115,15 @@
                                              const vector<String16>& cookies,
                                              const MetricDimensionKey& dimKey) const {
     VLOG("SubscriberReporter::sendBroadcastLocked called.");
+    // TODO (b/148604617): convert MetricDimensionKey to StatsDimensiosnValueParcel
+    StatsDimensionsValueParcel parcel;
     pir->sendSubscriberBroadcast(
             configKey.GetUid(),
             configKey.GetId(),
             subscription.id(),
             subscription.rule_id(),
             cookies,
-            getStatsDimensionsValue(dimKey.getDimensionKeyInWhat()));
+            parcel);
 }
 
 sp<IPendingIntentRef> SubscriberReporter::getBroadcastSubscriber(const ConfigKey& configKey,