commit 527d59013f3465aa976824e1c5714e23da12a560
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 13 15:37:21 2020 +0000
committer Muhammad Qureshi <muhammadq@google.com> Fri Feb 14 14:49:33 2020 -0800
tree 3153f71816a7487a3ab59635ade1d667559c12ca
parent 7893855a15159034a82389f3de3a0616465d09ef

Remove libstats_jni from the platform

As part of statsd becoming a mainline module in R,
libstats_jni needs to live in the apex.

Bug: 148620413
Test: m
Test: fastboot flashall

Change-Id: I22c2816c863e7a4462a79ac99238b06aca40a2d6

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index baa1c25..c9d7470 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -74,7 +74,5 @@
     apex_available: [
         "com.android.os.statsd",
         "test_com.android.os.statsd",
-        //TODO (b/148620413): remove platform.
-         "//apex_available:platform",
     ],
 }

apex/framework/java/android/util/StatsLog.java

diff --git a/apex/framework/java/android/util/StatsLog.java b/apex/framework/java/android/util/StatsLog.java
index 511bc01..536b71a 100644
--- a/apex/framework/java/android/util/StatsLog.java
+++ b/apex/framework/java/android/util/StatsLog.java
@@ -36,6 +36,11 @@
  * define custom metrics inside statsd.
  */
 public final class StatsLog {
+
+    // Load JNI library
+    static {
+        System.loadLibrary("stats_jni");
+    }
     private static final String TAG = "StatsLog";
     private static final boolean DEBUG = false;
     private static final int EXPERIMENT_IDS_FIELD_ID = 1;