From 45e403bd2e994fb191d4b1513e7176c68f8691bb Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Fri, 11 Jun 2021 15:22:01 +0900 Subject: [PATCH] Use NetworkStack instead of NetworkStackNext Now that NetworkStack has bumped its target SDK to 31, use it instead of the development SDK NetworkStackNext binary. In practice NetworkStack and NetworkStackNext are currently identical, as "current" is now SDK 31 in S branches, and NetworkStackNext does not contain any T-specific code yet. This change should not be merged in development branches downstream of AOSP. Bug: 189581241 Test: device boots, has connectivity Merged-In: Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5 Change-Id: I990c76da41d56c8756835b5743e1666d1382f796 --- target/product/base_system.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index f6a61043e3..50f1fb5f7f 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -216,7 +216,7 @@ PRODUCT_PACKAGES += \ mtpd \ ndc \ netd \ - NetworkStackNext \ + NetworkStack \ odsign \ org.apache.http.legacy \ otacerts \