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

Commit 4a9bc77e authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Add build targets for non-mainline NetworkStack" into qt-dev

am: bca73ac0c6

Change-Id: I18504341411e0dd2385e0fd25b940e3ad1acb74b
parents f54d64f4 e2503a24
Loading
Loading
Loading
Loading
+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 {