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

Commit 48586110 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

DO NOT MERGE: Enable/disable current targets via soong var instead of inline. 

Add a soong variable to enable/disable all targets that build
against the current SDK. This makes it easy to enable or disable
those targets all together. It also makes it much easier to
automerge Android.bp changes from AOSP to mainline-prod without
merge conflict, because the build target definitions are always
the same, only the variable at the top of the file changes.

Bug: 167645754
Test: m NetworkStackApiStableShims succeeds
Test: m NetworkStackApiCurrentShims fails with "unknown target" error
Ignore-AOSP-First: needed to solve merge conflicts
Change-Id: Ie0e7d4f73efcf1942aadf8b9d67e4de914307c09
parent f7603318

Android.bp

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

}



// Whether to enable the targets in this file that target current SDKs.

// Set to false in branches like mainline-prod where API classes are too old to build current code.

enable_current_sdk_targets = false



java_defaults {

    name: "NetworkStackDevApiLevel",

    min_sdk_version: "29",
@@ -113,7 +117,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: "NetworkStackApi31Shims",

    enabled: false, // Disabled in mainline-prod

    enabled: enable_current_sdk_targets,

    defaults: ["NetworkStackShimsDefaults"],

    srcs: [

        "apishim/31/**/*.java",
@@ -133,7 +137,7 @@ java_library { 
// called directly by the networkstack code.

java_library {

    name: "NetworkStackApiCurrentShims",

    enabled: false, // Disabled in mainline-prod

    enabled: enable_current_sdk_targets,

    defaults: ["NetworkStackShimsDefaults"],

    static_libs: [

        "NetworkStackShimsCommon",
@@ -199,7 +203,7 @@ android_library { 
    ],

    static_libs: ["NetworkStackApiCurrentShims"],

    manifest: "AndroidManifestBase.xml",

    enabled: false, // Disabled in mainline-prod

    enabled: enable_current_sdk_targets,

    visibility: [

        "//frameworks/base/tests/net/integration",

        "//packages/modules/Connectivity/Tethering/tests/integration",
@@ -267,7 +271,7 @@ android_app { 
    // The InProcessNetworkStack goes together with the PlatformCaptivePortalLogin, which replaces

    // the default CaptivePortalLogin.

    required: ["PlatformNetworkPermissionConfig", "PlatformCaptivePortalLogin"],

    enabled: false, // Disabled in mainline-prod

    enabled: enable_current_sdk_targets,

}



// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
@@ -276,7 +280,7 @@ android_library { 
    defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],

    static_libs: ["NetworkStackApiCurrentLib"],

    manifest: "AndroidManifest.xml",

    enabled: false, // Disabled in mainline-prod

    enabled: enable_current_sdk_targets,

}



// NetworkStack build targeting the current API release, for testing on in-development SDK
@@ -288,7 +292,7 @@ android_app { 
    manifest: "AndroidManifest_Next.xml",

    // The permission configuration *must* be included to ensure security of the device

    required: ["NetworkPermissionConfig"],

    enabled: false, // Disabled in mainline-prod

    enabled: enable_current_sdk_targets,

}



// Updatable network stack for finalized API