diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-11-08 10:06:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-08 10:06:35 +0000 |
| commit | e75ecf72dbe206504f0a70ff596a227f7b107e20 (patch) | |
| tree | c7195b0c8438b8adc5a5a182cea43bb309cbe148 | |
| parent | 73a8dab22375ff147a316d1c026136ba1e468b80 (diff) | |
| parent | e618aa3a317233bb50fda31e45a13f96845d5dd7 (diff) | |
Merge "Use NetworkStack as mainline target w/ stable API"
| -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 |