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

Commit d57e021b authored by Muhammad Qureshi's avatar Muhammad Qureshi
Browse files

Generate stable version of NetworkStackStatsLog 

Add another genrule to generate stable version of NetworkStatsLog which
compiles against R API. Use this genrule for stable NetworkStack.
The 'current' version of NetworkStackStatsLog contains usage of new SystemApi added in S.

Also use --minApiLevel 29 instead of --supportQ

Bug: 175314831
Bug: 160938178
Test: m statlog-networkstack-java-gen-current
Test: m statlog-networkstack-java-gen-stable
Test: inspect generated stable and current NetworkStackStatsLog files.
Change-Id: I5e1c0e08b1f2ece5cf25ecb7cb919499100dd2a8
parent 4840a772

Android.bp

+14 −4
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ android_library { 
    srcs: [

        ":NetworkStackApiCurrentShims",

        "src/**/*.java",

        ":statslog-networkstack-java-gen"

        ":statslog-networkstack-java-gen-current"

    ],

    manifest: "AndroidManifestBase.xml",

}
@@ -130,7 +130,7 @@ android_library { 
    defaults: ["NetworkStackReleaseApiLevel"],

    srcs: [

        "src/**/*.java",

        ":statslog-networkstack-java-gen",

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

    ],

    // API stable uses a jarjared version of the shims

    static_libs: [
@@ -261,14 +261,24 @@ cc_library_shared { 
}



genrule {

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

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

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

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

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

         " --supportQ",

         " --minApiLevel 29",

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

}



genrule {

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

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

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

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

         " --minApiLevel 29 --compileApiLevel 30",

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

}





version_code_networkstack_next = "300000000"

version_code_networkstack_test = "999999999"