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

Commit 65cbd15e authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Revert "Revert "Use NetworkStack as mainline target w/ stable API"""

parents 7960933c ec9d8a69

Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ android_app { 
    certificate: "platform",

    manifest: "AndroidManifest_InProcess.xml",

    // InProcessNetworkStack is a replacement for NetworkStack

    overrides: ["NetworkStack"],

    overrides: ["NetworkStack", "NetworkStackNext"],

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

    // The InProcessNetworkStack goes together with the PlatformCaptivePortalLogin, which replaces

    // the default CaptivePortalLogin.
@@ -160,7 +160,7 @@ android_app { 


// Updatable network stack packaged as an application

android_app {

    name: "NetworkStack",

    name: "NetworkStackNext",

    defaults: ["NetworkStackAppDefaults", "NetworkStackApiCurrentLevel"],

    static_libs: ["NetworkStackApiCurrentLib"],

    certificate: "networkstack",
@@ -171,7 +171,7 @@ android_app { 


// Updatable network stack for finalized API

android_app {

    name: "NetworkStackApiStable",

    name: "NetworkStack",

    defaults: ["NetworkStackAppDefaults", "NetworkStackApiStableLevel"],

    static_libs: ["NetworkStackApiStableLib"],

    certificate: "networkstack",

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CaptivePortalLogin)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/NetworkStack)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/NetworkStackApiStable)



# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER