commit 13169ccba2d9e11e311babd8fc80f41c610c753e
author Christopher Ferris <cferris@google.com> Tue Mar 17 01:31:16 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 17 01:31:16 2015 +0000
tree 136bc7600924b43f4f5afac7e8fff5387c1707e0
parent 0f98a3781c4fab57bdd696cca3edd6614d65abe6
parent f123057f5e080687ce17e0e9c23a62954db53f39

Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index d6449d5..0b76b53 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -96,8 +96,6 @@
 BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY := $(BUILD_SYSTEM)/host_dalvik_static_java_library.mk
 
 
--include cts/build/config.mk
-
 # ###############################################################
 # Parse out any modifier targets.
 # ###############################################################

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 4a2a626..0e058af 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -93,6 +93,9 @@
 # and host information.
 include $(BUILD_SYSTEM)/config.mk
 
+# CTS-specific config.
+-include cts/build/config.mk
+
 # This allows us to force a clean build - included after the config.mk
 # environment setup is done, but before we generate any dependencies.  This
 # file does the rm -rf inline so the deps which are all done below will

target/product/base.mk

diff --git a/target/product/base.mk b/target/product/base.mk
index 0d052b5..85c01a2 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -95,7 +95,6 @@
     monkey \
     mtpd \
     ndc \
-    netcfg \
     netd \
     ping \
     ping6 \