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

Commit 9f69921f authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Conditionally disable NetworkStackApi33Shims 

The "current" shim targets are only necessary in branches that can use
non-stable APIs, and can fail to build otherwise.

Apply ConnectivityNextEnableDefaults so they are disabled on such
branches. Also deprecate NetworkStackNextEnableDefaults, so
ConnectivityNextEnableDefaults is used everywhere.

Bug: 190249673
Test: m
Change-Id: Iffa76a05a803e0c91fa81170f4bc5f2022d1514f
parent 9e6c3138

Android.bp

+8 −6
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



// TODO: remove this default and replace with ConnectivityNextEnableDefaults. This will need to be

// done separately in each branch due to merge conflicts.

// Defaults to enable/disable java targets that depend on

// NetworkStackNext, which uses development APIs. "enabled" may

// have a different value depending on the branch.
@@ -159,7 +161,7 @@ java_library { 
// integer so if the next SDK release happens to use that integer, we don't need to rename them.

java_library {

    name: "NetworkStackApi33Shims",

    defaults: ["NetworkStackShimsDefaults"],

    defaults: ["NetworkStackShimsDefaults", "ConnectivityNextEnableDefaults"],

    srcs: [

        "apishim/33/**/*.java",

    ],
@@ -180,7 +182,7 @@ java_library { 
// called directly by the networkstack code.

java_library {

    name: "NetworkStackApiCurrentShims",

    defaults: ["NetworkStackShimsDefaults"],

    defaults: ["NetworkStackShimsDefaults", "ConnectivityNextEnableDefaults"],

    static_libs: [

        "NetworkStackShimsCommon",

        "NetworkStackApi29Shims",
@@ -250,7 +252,7 @@ android_library { 
    defaults: [

        "NetworkStackDevApiLevel",

        "NetworkStackAndroidLibraryDefaults",

        "NetworkStackNextEnableDefaults",

        "ConnectivityNextEnableDefaults",

    ],

    srcs: [

        "src/**/*.java",
@@ -323,7 +325,7 @@ android_app { 
    defaults: [

        "NetworkStackAppDefaults",

        "NetworkStackDevApiLevel",

        "NetworkStackNextEnableDefaults",

        "ConnectivityNextEnableDefaults",

    ],

    static_libs: ["NetworkStackApiCurrentLib"],

    certificate: "platform",
@@ -345,7 +347,7 @@ android_library { 
    defaults: [

        "NetworkStackAppDefaults",

        "NetworkStackDevApiLevel",

        "NetworkStackNextEnableDefaults",

        "ConnectivityNextEnableDefaults",

    ],

    static_libs: ["NetworkStackApiCurrentLib"],

    manifest: "AndroidManifest.xml"
@@ -357,7 +359,7 @@ android_app { 
    defaults: [

        "NetworkStackAppDefaults",

        "NetworkStackDevApiLevel",

        "NetworkStackNextEnableDefaults",

        "ConnectivityNextEnableDefaults",

    ],

    static_libs: ["NetworkStackNextManifestBase"],

    certificate: "networkstack",

tests/integration/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ android_test { 
    defaults: [

        "NetworkStackIntegrationTestsDefaults",

        "NetworkStackIntegrationTestsJniDefaults",

        "NetworkStackNextEnableDefaults",

        "ConnectivityNextEnableDefaults",

    ],

    static_libs: [

        "NetworkStackApiCurrentLib",

tests/unit/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ android_test { 
    test_suites: ["general-tests"],

    defaults: [

        "NetworkStackTestsDefaults",

        "NetworkStackNextEnableDefaults",

        "ConnectivityNextEnableDefaults",

        "connectivity-mainline-presubmit-java-defaults",

    ],

    static_libs: ["NetworkStackApiCurrentLib"],