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

Commit dfd6aa25 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Use the R API statsd library on R NetworkStack" into rvc-dev am: 333f3c1d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12084811

Change-Id: I8bbdef4121ac4aeee392c8137a71a1687d5d2d20
parents 4a9d1c53 333f3c1d

Android.bp

+1 −10
Original line number Original line Diff line number Diff line
@@ -128,7 +128,7 @@ android_library { 
    defaults: ["NetworkStackReleaseApiLevel"],

    defaults: ["NetworkStackReleaseApiLevel"],

    srcs: [

    srcs: [

        "src/**/*.java",

        "src/**/*.java",

        ":statslog-networkstack-java-gen-q",

        ":statslog-networkstack-java-gen",

    ],

    ],

    // API stable uses a jarjared version of the shims

    // API stable uses a jarjared version of the shims

    static_libs: [

    static_libs: [
@@ -253,15 +253,6 @@ cc_library_shared { 
    ],

    ],

}

}





genrule {

    name: "statslog-networkstack-java-gen-q",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +

         " --javaPackage com.android.networkstack.metrics --javaClass NetworkStackStatsLog" +

         " --compileQ",

    out: ["com/android/networkstack/metrics/NetworkStackStatsLog.java"],

}



genrule {

genrule {

    name: "statslog-networkstack-java-gen",

    name: "statslog-networkstack-java-gen",

    tools: ["stats-log-api-gen"],

    tools: ["stats-log-api-gen"],