commit cf9509df016138e0b5426612f0b35138fd77fcba
author Daniel Norman <danielnorman@google.com> Tue Mar 12 16:53:31 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 12 16:53:31 2019 +0000
tree 7331e9e9107209c43e3cc73df6f95b11b3059a6c
parent c6bf520424a90e35194d4f83566eca5c3d4f31a2
parent 2c99c5bbd261e058830ea72e53dfa35af2a80354

Merge "Adds support for optional config files to configure the merge."

target/product/go_defaults_common.mk

diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk
index e35bf30..7042f6d 100644
--- a/target/product/go_defaults_common.mk
+++ b/target/product/go_defaults_common.mk
@@ -61,9 +61,8 @@
 # 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
+# Do not spin up a separate process for the network stack on go devices, use an in-process APK.
+PRODUCT_PACKAGES += InProcessNetworkStack
 
 # 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