commit 3cc6d236c38ce43ac4b884bf5e16a9f18c278810
author Remi NGUYEN VAN <reminv@google.com> Tue May 14 14:08:56 2019 +0900
committer Remi NGUYEN VAN <reminv@google.com> Tue May 14 07:31:50 2019 +0000
tree 407da09a5a4f0ab720ece8f473e53491fce79912
parent 4f901570f99ce4a82ac5ac1731b9895bf30096b8

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
Change-Id: If4a7a003128a555e512c88469653c3fb2ad864d5

packages/NetworkStack/Android.bp

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