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

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

Merge "Generate stable version of NetworkStackStatsLog" am: 46c3f36e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib882ef952f32728f88080e632b401d9df3540b47
parents 37eed68a 46c3f36e
Loading
Loading
Loading
Loading
+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"