Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 650c6a45 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Muhammad Qureshi
Browse files

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
parent 12a75f32
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -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",
    ],
}
+5 −0
Original line number Diff line number Diff line
@@ -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;
+0 −1
Original line number Diff line number Diff line
@@ -271,7 +271,6 @@ cc_library_shared {
                "libnativewindow",
                "libdl",
                "libdl_android",
                "libstats_jni",
                "libstatslog",
                "server_configurable_flags",
                "libstatspull",
+0 −2
Original line number Diff line number Diff line
@@ -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),