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

Commit 006d3ee6 authored by Muhammad Qureshi's avatar Muhammad Qureshi Committed by Android (Google) Code Review
Browse files

Merge "Fix StatsLog JNI registration"

parents 65c2ac35 93b4e99d

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ cc_library_shared { 
                "libnativewindow",

                "libdl",

                "libdl_android",

                "libstats_jni",

                "libstatslog",

                "server_configurable_flags",

            ],

core/jni/AndroidRuntime.cpp

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 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);
@@ -1446,6 +1447,7 @@ 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),

native/android/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ cc_library_shared { 
        "libgui",

        "libharfbuzz_ng",  // Only for including hb.h via minikin

        "libsensor",

        "libstats_jni",

        "libandroid_runtime",

        "libminikin",

        "libnetd_client",