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

Commit 24bfb409 authored by Howard Ro's avatar Howard Ro
Browse files

Revert "Migrate Statsd to the apex" 

Revert "Update statsd binary path for apex"

Revert submission 10356003-statsd_apex

Reason for revert: https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=build_test&lkgb=6221366&fkbb=6221428
Reverted Changes:
Ic84e77269:Update init.rc for statsd setup
I6f3fab4b4:Update statsd binary path for apex
Ib4ea98aed:Migrate Statsd to the apex

Change-Id: I089d5b9bbbdc363e27e79e4addd4eec1e4339c48
parent 89e09b58

apex/statsd/Android.bp

+2 −8
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ apex_defaults { 
    native_shared_libs: [

        "libstats_jni",

    ],

    binaries: ["statsd"],

    // binaries: ["vold"],

    java_libs: [

        "framework-statsd",

        "service-statsd",

    ],

    compile_multilib: "both",

    prebuilts: ["com.android.os.statsd.init.rc"],

    // prebuilts: ["my_prebuilt"],

    name: "com.android.os.statsd-defaults",

    key: "com.android.os.statsd.key",

    certificate: ":com.android.os.statsd.certificate",
@@ -47,12 +47,6 @@ 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 {

cmds/statsd/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -217,10 +217,7 @@ cc_binary { 


    shared_libs: ["libgtest_prod"],



    apex_available: [

        "com.android.os.statsd",

        "test_com.android.os.statsd",

    ],

    init_rc: ["statsd.rc"],

}



// ==============

apex/statsd/statsd.rc→cmds/statsd/statsd.rc

+11 −1
Original line number Diff line number Diff line
@@ -12,9 +12,19 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



service statsd /apex/com.android.os.statsd/bin/statsd

service statsd /system/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

services/core/java/com/android/server/Watchdog.java

+1 −1
Original line number Diff line number Diff line
@@ -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

        "/apex/com.android.os.statsd/bin/statsd",  // Stats daemon

        "/system/bin/statsd",  // Stats daemon

    };



    public static final List<String> HAL_INTERFACES_OF_INTEREST = Arrays.asList(