commit 5f2e395212e638071cc08283101913ab2512465e
author Remi NGUYEN VAN <reminv@google.com> Mon May 18 21:08:36 2020 +0900
committer Remi NGUYEN VAN <reminv@google.com> Tue May 19 09:56:57 2020 +0000
tree 3cdb059173952947d099a0fd723bb33255fa653f
parent 2fc5a393e0c04b7d069fd1b1dfb69dbd79abfdb8

Use NetworkStack on system image

Now that NetworkStack was bumped to API 30, use NetworkStack instead of
NetworkStackNext on the system image.

This change should not be merged in branches that are used for building
S system images for internal testing. Note that the merged-in change
is not related to this change; it is just used to prevent this change
from merging into the aosp/master merge path.

Bug: 143586229
Test: m
Merged-In: Ibc74edb88904f953a1e5e6ceef44c461f381c9cf
Change-Id: I484e148fab80a01d2b20ebf48604d9e923fe7cd3

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index c346c13..c074807 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -211,7 +211,7 @@
     mtpd \
     ndc \
     netd \
-    NetworkStackNext \
+    NetworkStack \
     org.apache.http.legacy \
     otacerts \
     PackageInstaller \