diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-11-11 10:25:25 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-11 10:25:25 -0800 |
| commit | e9aeb3af8ef5a64d87050d2f6337581f18a423fb (patch) | |
| tree | b8ecda3e80bcb29d5de24509e248950a800a4e73 | |
| parent | 7c9144ba237f0f1ff064a90b8d902e0cd093c062 (diff) | |
| parent | 8ee5b28804b96b7f7eba7a47893e4c8a2169a5c8 (diff) | |
Merge "Revert "Revert "Use NetworkStack as mainline target w/ stable API""" am: 65cbd15ead am: 75d3c1e29c
am: 8ee5b28804
Change-Id: Ifa4d7bd9e5dc396ba580833f9d1c3446bce9bf4b
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | CleanSpec.mk | 2 |
2 files changed, 5 insertions, 3 deletions
@@ -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", 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 |