diff options
| -rw-r--r-- | apex/statsd/Android.bp | 10 | ||||
| -rw-r--r-- | apex/statsd/statsd.rc (renamed from cmds/statsd/statsd.rc) | 12 | ||||
| -rw-r--r-- | cmds/statsd/Android.bp | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/Watchdog.java | 2 |
4 files changed, 14 insertions, 15 deletions
diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp index 0e9311034ee0..3b196925b91c 100644 --- a/apex/statsd/Android.bp +++ b/apex/statsd/Android.bp @@ -22,13 +22,13 @@ apex_defaults { native_shared_libs: [ "libstats_jni", ], - // binaries: ["vold"], + binaries: ["statsd"], java_libs: [ "framework-statsd", "service-statsd", ], compile_multilib: "both", - // prebuilts: ["my_prebuilt"], + prebuilts: ["com.android.os.statsd.init.rc"], name: "com.android.os.statsd-defaults", key: "com.android.os.statsd.key", certificate: ":com.android.os.statsd.certificate", @@ -47,6 +47,12 @@ android_app_certificate { certificate: "com.android.os.statsd", } +prebuilt_etc { + name: "com.android.os.statsd.init.rc", + src: "statsd.rc", + filename: "init.rc", + installable: false, +} // JNI library for StatsLog.write cc_library_shared { diff --git a/cmds/statsd/statsd.rc b/apex/statsd/statsd.rc index a98ecd586b42..605da2af0c19 100644 --- a/cmds/statsd/statsd.rc +++ b/apex/statsd/statsd.rc @@ -12,19 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -service statsd /system/bin/statsd +service statsd /apex/com.android.os.statsd/bin/statsd class main socket statsdw dgram+passcred 0222 statsd statsd user statsd group statsd log writepid /dev/cpuset/system-background/tasks - -on property:ro.statsd.enable=false - stop statsd - -on post-fs-data - # Create directory for statsd - mkdir /data/misc/stats-data/ 0770 statsd system - mkdir /data/misc/stats-service/ 0770 statsd system - mkdir /data/misc/stats-active-metric/ 0770 statsd system - mkdir /data/misc/train-info/ 0770 statsd system diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index 93522d4ff0a6..5fe64c42186f 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -217,7 +217,10 @@ cc_binary { shared_libs: ["libgtest_prod"], - init_rc: ["statsd.rc"], + apex_available: [ + "com.android.os.statsd", + "test_com.android.os.statsd", + ], } // ============== diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java index a1ccd8459c69..8900eee6f50f 100644 --- a/services/core/java/com/android/server/Watchdog.java +++ b/services/core/java/com/android/server/Watchdog.java @@ -100,7 +100,7 @@ public class Watchdog extends Thread { "media.codec", // vendor/bin/hw/android.hardware.media.omx@1.0-service "media.swcodec", // /apex/com.android.media.swcodec/bin/mediaswcodec "com.android.bluetooth", // Bluetooth service - "/system/bin/statsd", // Stats daemon + "/apex/com.android.os.statsd/bin/statsd", // Stats daemon }; public static final List<String> HAL_INTERFACES_OF_INTEREST = Arrays.asList( |