Revert "Revert "Use NetworkStack as mainline target w/ stable API""
This reverts commit dc19816134caefa6057b1097276f433cdbe843ba.
Reason for revert: roll forward after fixing tests in b/144168912
Change-Id: Idc3d306be56f2e322cab9802bb6b418fa40bffef
diff --git a/Android.bp b/Android.bp
index 27a1044..ef11268 100644
--- a/Android.bp
+++ b/Android.bp
@@ -151,7 +151,7 @@
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 @@
// 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 @@
// Updatable network stack for finalized API
android_app {
- name: "NetworkStackApiStable",
+ name: "NetworkStack",
defaults: ["NetworkStackAppDefaults", "NetworkStackApiStableLevel"],
static_libs: ["NetworkStackApiStableLib"],
certificate: "networkstack",