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

Commit 33ac2d30 authored by Muhammad Qureshi's avatar Muhammad Qureshi Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Generate stable version of NetworkStackStatsLog"" am: d598ce3f am: af9f2e48 am: a4f56e66

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3be291d2ef0056968284b8adfe74bad35c80c78
parents e0ead075 a4f56e66

Android.bp

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

        ":NetworkStackApiCurrentShims",

        "src/**/*.java",

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

        ":statslog-networkstack-java-gen"

    ],

    manifest: "AndroidManifestBase.xml",

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

    srcs: [

        "src/**/*.java",

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

        ":statslog-networkstack-java-gen",

    ],

    // API stable uses a jarjared version of the shims

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



genrule {

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

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

    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",

         " --supportQ",

    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"