diff options
| author | Muhammad Qureshi <muhammadq@google.com> | 2020-02-03 17:12:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-03 17:12:49 +0000 |
| commit | 006d3ee677a87e8def99e3fea01e919d62de4ac5 (patch) | |
| tree | 94437d423e2988db82b71fbc1c3665855f5da207 | |
| parent | 65c2ac35abbafe95524c73aa392c38b608fed79c (diff) | |
| parent | 93b4e99d9b975b64c5cae761e67001e664fa4a1a (diff) | |
Merge "Fix StatsLog JNI registration"
| -rw-r--r-- | core/jni/Android.bp | 1 | ||||
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 2 | ||||
| -rw-r--r-- | native/android/Android.bp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 7414b8500977..cec68df3c949 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -269,6 +269,7 @@ cc_library_shared { "libnativewindow", "libdl", "libdl_android", + "libstats_jni", "libstatslog", "server_configurable_flags", ], diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 7bb25575898f..481be241cc99 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -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), diff --git a/native/android/Android.bp b/native/android/Android.bp index 34ab7a0a0770..0c6f507787d9 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -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", |