commit 7264a0daabef0b25a36350304064acfe9501e9fa
author Remi NGUYEN VAN <reminv@google.com> Wed Dec 26 00:48:25 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 26 00:48:25 2018 +0000
tree 77e14c1d97fc04929f7794723b09b038e7017d9e
parent c0b701b2415791cbd89c857e09b391332c7fce01
parent a3298109716ccf69efd22248ab1d9316aa4ecc98

Merge "Build NetworkStack package"

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index b5804b1..392a580 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -210,6 +210,7 @@
     mtpd \
     ndc \
     netd \
+    NetworkStack \
     org.apache.http.legacy \
     perfetto \
     ping \

target/product/go_defaults_common.mk

diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk
index 18907c1..06bdec9 100644
--- a/target/product/go_defaults_common.mk
+++ b/target/product/go_defaults_common.mk
@@ -61,6 +61,10 @@
 # Do not generate libartd.
 PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false
 
+# Do not spin up a separate process for the network stack on go devices, use an in-process lib.
+PRODUCT_PACKAGES += NetworkStackLib
+PRODUCT_SYSTEM_SERVER_JARS += NetworkStackLib
+
 # Strip the local variable table and the local variable type table to reduce
 # the size of the system image. This has no bearing on stack traces, but will
 # leave less information available via JDWP.