From 650c6a454d84b207552a4769685c51623a5aa7fd Mon Sep 17 00:00:00 2001 From: TreeHugger Robot Date: Thu, 13 Feb 2020 15:37:21 +0000 Subject: 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 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'apex/statsd') diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp index baa1c251324f..c9d747021557 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 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; -- cgit v1.2.3-59-g8ed1b