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

Commit 892dae2c authored by Hai Shalom's avatar Hai Shalom
Browse files

DO NOT MERGE Disable additional NetworkStack targets 

Disabled additional NetworkStack targets in mainline-prod branch.

Bug: 175609674
Test: Compiles
Ignore-AOSP-First: Isolated change to mainline-prod
Change-Id: I96575e14e1909bb35bdaa4f1ab5baaa7538b0fd1
parent 31ee6a5d

Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ android_library { 
        ":statslog-networkstack-java-gen"

    ],

    manifest: "AndroidManifestBase.xml",

    enabled: false, // Disabled in mainline-prod

}



// For API stable, first build the dependencies using jarjar compat rules, then build the sources
@@ -180,6 +181,7 @@ android_app { 
    // The InProcessNetworkStack goes together with the PlatformCaptivePortalLogin, which replaces

    // the default CaptivePortalLogin.

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

    enabled: false, // Disabled in mainline-prod

}



// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
@@ -187,7 +189,8 @@ android_library { 
    name: "NetworkStackNextManifestBase",

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

    static_libs: ["NetworkStackApiCurrentLib"],

    manifest: "AndroidManifest.xml"

    manifest: "AndroidManifest.xml",

    enabled: false, // Disabled in mainline-prod

}



// NetworkStack build targeting the current API release, for testing on in-development SDK

tests/integration/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ android_test { 
    certificate: "networkstack",

    platform_apis: true,

    test_suites: ["device-tests"],

    enabled: false, // Disabled in mainline-prod

}



// The static lib needs to be jarjared by each module so they do not conflict with each other