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

Commit fdfd2010 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Use the R API statsd library on R NetworkStack 

Using the Q library causes parse errors for stats, as that library is
not forward-compatible with R. The R library is backwards-compatible
with Q and should be used on R builds.

Bug: 160656765
Test: statsd_testdrive on device with an updated NetworkStack
Change-Id: Idf3e654a679ab31d0d3c3d960f9745387edbbe4a
parent b8ac953a

Android.bp

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

    srcs: [

        "src/**/*.java",

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

        ":statslog-networkstack-java-gen",

    ],

    // API stable uses a jarjared version of the shims

    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 {

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

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