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

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I036faba179a28e2644bcdbd6d12073fb016f9a29
parents 2c3466f2 af9f2e48

Android.bp

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

    srcs: [

        ":NetworkStackApiCurrentShims",

        ":NetworkStackApiCurrentShims",

        "src/**/*.java",

        "src/**/*.java",

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

        ":statslog-networkstack-java-gen"

    ],

    ],

    manifest: "AndroidManifestBase.xml",

    manifest: "AndroidManifestBase.xml",

    enabled: false, // Disabled in mainline-prod

    enabled: false, // Disabled in mainline-prod
@@ -131,7 +131,7 @@ android_library { 
    defaults: ["NetworkStackReleaseApiLevel"],

    defaults: ["NetworkStackReleaseApiLevel"],

    srcs: [

    srcs: [

        "src/**/*.java",

        "src/**/*.java",

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

        ":statslog-networkstack-java-gen",

    ],

    ],

    // API stable uses a jarjared version of the shims

    // API stable uses a jarjared version of the shims

    static_libs: [

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

}





genrule {

genrule {

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

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

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

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

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

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

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

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

         " --minApiLevel 29",

         " --supportQ",

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

    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_next = "300000000"

version_code_networkstack_test = "999999999"

version_code_networkstack_test = "999999999"