From 650c6a454d84b207552a4769685c51623a5aa7fd Mon Sep 17 00:00:00 2001
From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Thu, 13 Feb 2020 15:37:21 +0000
Subject: [PATCH] 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/statsd/Android.bp                                | 2 --
 apex/statsd/framework/java/android/util/StatsLog.java | 5 +++++
 core/jni/Android.bp                                   | 1 -
 core/jni/AndroidRuntime.cpp                           | 2 --
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index baa1c251324fa..c9d747021557a 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -74,7 +74,5 @@ cc_library_shared {
     apex_available: [
         "com.android.os.statsd",
         "test_com.android.os.statsd",
-        //TODO (b/148620413): remove platform.
-         "//apex_available:platform",
     ],
 }
diff --git a/apex/statsd/framework/java/android/util/StatsLog.java b/apex/statsd/framework/java/android/util/StatsLog.java
index 511bc01f521eb..536b71a0e6252 100644
--- a/apex/statsd/framework/java/android/util/StatsLog.java
+++ b/apex/statsd/framework/java/android/util/StatsLog.java
@@ -36,6 +36,11 @@ import com.android.internal.util.StatsdStatsLog;
  * 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;
diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index d1a7d240dfa2f..a0b819c2f0791 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -271,7 +271,6 @@ cc_library_shared {
                 "libnativewindow",
                 "libdl",
                 "libdl_android",
-                "libstats_jni",
                 "libstatslog",
                 "server_configurable_flags",
                 "libstatspull",
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index bbc23fec87ea2..d790ada8083df 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -108,7 +108,6 @@ namespace android {
 extern int register_android_app_admin_SecurityLog(JNIEnv* env);
 extern int register_android_content_AssetManager(JNIEnv* env);
 extern int register_android_util_EventLog(JNIEnv* env);
-extern int register_android_util_StatsLog(JNIEnv* env);
 extern int register_android_util_StatsLogInternal(JNIEnv* env);
 extern int register_android_util_Log(JNIEnv* env);
 extern int register_android_util_MemoryIntArray(JNIEnv* env);
@@ -1432,7 +1431,6 @@ static const RegJNIRec gRegJNI[] = {
         REG_JNI(register_android_util_EventLog),
         REG_JNI(register_android_util_Log),
         REG_JNI(register_android_util_MemoryIntArray),
-        REG_JNI(register_android_util_StatsLog),
         REG_JNI(register_android_util_StatsLogInternal),
         REG_JNI(register_android_app_admin_SecurityLog),
         REG_JNI(register_android_content_AssetManager),