From 4bd8a8b39a30e3e8c4d9d264f224cbcf5d71f7ce Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Tue, 14 May 2019 14:08:56 +0900
Subject: [PATCH] Have InProcessNetworkStack override NetworkStack

This avoids shipping both APKs on Go devices, as would be previously
done with the default Go configuration that still included NetworkStack.

Test: Flashed, booted walleye with svelte config. Verified that
      NetworkStack is not on the device and InProcessNetworkStack is
      used. WiFi working.
Bug: 132666298
(clean cherry-pick from qt-dev)
Merged-In: If4a7a003128a555e512c88469653c3fb2ad864d5
Change-Id: I8f8cf41947eb3be51ac0e97a4f0ec27e6d69aa7e
---
 packages/NetworkStack/Android.bp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/NetworkStack/Android.bp b/packages/NetworkStack/Android.bp
index 9c8efe6a13b95..64718da8333b6 100644
--- a/packages/NetworkStack/Android.bp
+++ b/packages/NetworkStack/Android.bp
@@ -108,6 +108,8 @@ android_app {
     defaults: ["NetworkStackAppCommon"],
     certificate: "platform",
     manifest: "AndroidManifest_InProcess.xml",
+    // InProcessNetworkStack is a replacement for NetworkStack
+    overrides: ["NetworkStack"],
 }
 
 // Updatable network stack packaged as an application