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

Commit e1aed9ee authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Add defaults to enable/disable NetworkStackNext 

The defaults can be used to enable/disable NetworkStackNext targets
depending on the branch, while minimizing merge conflicts.

NetworkStackNext may need to be disabled in branches that only have
the latest stable SDK available, as it uses unstable APIs.

Test: builds
Change-Id: I78e8c7722edf2f2d22ab716315ed41ba3dcdfd2c
parent ebc22a81

Android.bp

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

}



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

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

// have a different value depending on the branch.

java_defaults {

    name: "NetworkStackNextEnableDefaults",

    enabled: true,

}

// This is a placeholder comment to avoid merge conflicts

// as the above target may have different "enabled" values

// depending on the branch



java_defaults {

    name: "NetworkStackDevApiLevel",

    min_sdk_version: "29",
@@ -231,7 +242,11 @@ java_defaults { 
// The versions of the android library containing network stack code compiled for each SDK variant.

android_library {

    name: "NetworkStackApiCurrentLib",

    defaults: ["NetworkStackDevApiLevel", "NetworkStackAndroidLibraryDefaults"],

    defaults: [

        "NetworkStackDevApiLevel",

        "NetworkStackAndroidLibraryDefaults",

        "NetworkStackNextEnableDefaults",

    ],

    srcs: [

        "src/**/*.java",

        ":statslog-networkstack-java-gen-current"
@@ -304,7 +319,11 @@ java_defaults { 
// Non-updatable network stack running in the system server process for devices not using the module

android_app {

    name: "InProcessNetworkStack",

    defaults: [ "NetworkStackAppDefaults", "NetworkStackDevApiLevel"],

    defaults: [

        "NetworkStackAppDefaults",

        "NetworkStackDevApiLevel",

        "NetworkStackNextEnableDefaults",

    ],

    static_libs: ["NetworkStackApiCurrentLib"],

    certificate: "platform",

    manifest: "AndroidManifest_InProcess.xml",
@@ -322,7 +341,11 @@ android_app { 
// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top

android_library {

    name: "NetworkStackNextManifestBase",

    defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],

    defaults: [

        "NetworkStackAppDefaults",

        "NetworkStackDevApiLevel",

        "NetworkStackNextEnableDefaults",

    ],

    static_libs: ["NetworkStackApiCurrentLib"],

    manifest: "AndroidManifest.xml"

}
@@ -330,7 +353,11 @@ android_library { 
// NetworkStack build targeting the current API release, for testing on in-development SDK

android_app {

    name: "NetworkStackNext",

    defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],

    defaults: [

        "NetworkStackAppDefaults",

        "NetworkStackDevApiLevel",

        "NetworkStackNextEnableDefaults",

    ],

    static_libs: ["NetworkStackNextManifestBase"],

    certificate: "networkstack",

    manifest: "AndroidManifest_Next.xml",

tests/integration/Android.bp

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

        "NetworkStackIntegrationTestsDefaults",

        "NetworkStackIntegrationTestsJniDefaults",

        "NetworkStackNextEnableDefaults",

    ],

    static_libs: [

        "NetworkStackApiCurrentLib",

tests/unit/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ android_test { 
    srcs: [], // TODO: tests that only apply to the current, non-stable API can be added here

    test_suites: ["general-tests"],

    test_mainline_modules: ["CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"],

    defaults: ["NetworkStackTestsDefaults"],

    defaults: ["NetworkStackTestsDefaults", "NetworkStackNextEnableDefaults"],

    static_libs: ["NetworkStackApiCurrentLib"],

    compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit

    jarjar_rules: ":NetworkStackJarJarRules",