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

Commit 4a96f651 authored by Muhammad Qureshi's avatar Muhammad Qureshi Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Generate stable version of NetworkStackStatsLog""" am:... 

Merge "Revert "Revert "Generate stable version of NetworkStackStatsLog""" am: c0577710 am: dbcc6c2f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd7407c7375fc3462e53be4a1cf4ed80e0c23fff
parents 3b90d159 dbcc6c2f

Android.bp

+14 −4
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ android_library { 
    defaults: ["NetworkStackDevApiLevel", "NetworkStackAndroidLibraryDefaults"],

    srcs: [

        "src/**/*.java",

        ":statslog-networkstack-java-gen"

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

    ],

    static_libs: ["NetworkStackApiCurrentShims"],

    manifest: "AndroidManifestBase.xml",
@@ -200,7 +200,7 @@ android_library { 
    defaults: ["NetworkStackReleaseApiLevel", "NetworkStackAndroidLibraryDefaults"],

    srcs: [

        "src/**/*.java",

        ":statslog-networkstack-java-gen",

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

    ],

    static_libs: ["NetworkStackApiStableShims"],

    manifest: "AndroidManifestBase.xml",
@@ -331,14 +331,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"