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

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

Add build targets for non-mainline NetworkStack 

Add PlatformCaptivePortalLogin and PlatformNetworkPermissionConfig build
targets to override CaptivePortalLogin and NetworkPermissionConfig with
platform-key-signed packages easily. The added packages are unused by
default but can simplify setup for OEMs that use InProcessNetworkStack.

Bug: 132635211
Test: Added the new packages to sailfish build, built image: device has
      the proper packages signed with the right keys, networking and
      captive portal working fine.

Change-Id: I09656deb6ba928f56b478adebb60268fa6f484b0
parent 544ad304

Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -98,8 +98,6 @@ java_defaults { 
    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },

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

    required: ["NetworkPermissionConfig"],

}



// Non-updatable network stack running in the system server process for devices not using the module
@@ -110,6 +108,8 @@ android_app { 
    manifest: "AndroidManifest_InProcess.xml",

    // InProcessNetworkStack is a replacement for NetworkStack

    overrides: ["NetworkStack"],

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

    required: ["PlatformNetworkPermissionConfig"],

}



// Updatable network stack packaged as an application
@@ -119,6 +119,8 @@ android_app { 
    certificate: "networkstack",

    manifest: "AndroidManifest.xml",

    use_embedded_native_libs: true,

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

    required: ["NetworkPermissionConfig"],

}



genrule {