Merge "Revert "Revert "Use NetworkStack as mainline target w/ stable API"""
diff --git a/Android.bp b/Android.bp
index f17f1b1..762ace9 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",
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 43a1bd0..6c79f20 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -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