diff options
| author | 2020-02-17 09:00:54 +0000 | |
|---|---|---|
| committer | 2020-02-17 09:00:54 +0000 | |
| commit | a2ae63c433fec11f77873a1ac54e170f15da9968 (patch) | |
| tree | fff3fb9d9512121828015ad87096b4a55e1a5566 | |
| parent | 10d16e52bc8b57f2b8bfa09ce118731130469749 (diff) | |
| parent | 650c6a454d84b207552a4769685c51623a5aa7fd (diff) | |
Merge "Remove libstats_jni from the platform"
| -rw-r--r-- | apex/statsd/Android.bp | 2 | ||||
| -rw-r--r-- | apex/statsd/framework/java/android/util/StatsLog.java | 5 | ||||
| -rw-r--r-- | core/jni/Android.bp | 1 | ||||
| -rw-r--r-- | 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 1f9f18cd051a..c8aa526254b8 100644 --- a/apex/statsd/Android.bp +++ b/apex/statsd/Android.bp @@ -71,7 +71,5 @@ cc_library_shared { 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 diff --git a/apex/statsd/framework/java/android/util/StatsLog.java b/apex/statsd/framework/java/android/util/StatsLog.java index 511bc01f521e..536b71a0e625 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 653cbc90d88d..900445c9835a 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -272,7 +272,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 bbc23fec87ea..d790ada8083d 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), |