commit eb4f311a193720e31484ac5d2cbc1a4d18e37d31
author Howard Ro <yro@google.com> Mon Feb 17 09:00:54 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 17 09:00:54 2020 +0000
tree 159111a4508c536082a3f970493e7c3e9522dece
parent c772ea0d67271cd87a91b94ed6ecc94eac218b94
parent 527d59013f3465aa976824e1c5714e23da12a560

Merge "Remove libstats_jni from the platform"

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 1f9f18c..c8aa526 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -71,7 +71,5 @@
     apex_available: [
         "com.android.os.statsd",
         "test_com.android.os.statsd",
-        //TODO (b/148620413): remove platform.
-         "//apex_available:platform",
     ],
 }
\ No newline at end of file

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;