commit d3d95172c3645a1d7a12e540638207ae4fb69cae
author Narayan Kamath <narayan@google.com> Wed Dec 31 10:13:23 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 31 10:13:23 2014 +0000
tree b49a8ceebd759560be2d515e6e02e9eff09f4143
parent a4c40c373477983622622186946d21802400876e
parent 38c2dae5f12003ff39a5b1a5e46f079174fcedca

am 38c2dae5: Merge "Remove hardcoded include paths."

* commit '38c2dae5f12003ff39a5b1a5e46f079174fcedca':
  Remove hardcoded include paths.

core/jni/Android.mk

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 2d54742..d070c97 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -177,11 +177,9 @@
     $(call include-path-for, bluedroid) \
     $(call include-path-for, libhardware)/hardware \
     $(call include-path-for, libhardware_legacy)/hardware_legacy \
-    $(TOP)/bionic/libc/dns/include \
     $(TOP)/frameworks/av/include \
     $(TOP)/system/media/camera/include \
     $(TOP)/system/netd/include \
-    external/icu/icu4c/source/common \
     external/pdfium/core/include/fpdfapi \
     external/pdfium/core/include/fpdfdoc \
     external/pdfium/fpdfsdk/include \
@@ -191,11 +189,9 @@
     external/sqlite/dist \
     external/sqlite/android \
     external/expat/lib \
-    external/openssl/include \
     external/tremor/Tremor \
     external/jpeg \
     external/harfbuzz_ng/src \
-    external/zlib \
     frameworks/opt/emoji \
     libcore/include \
     $(call include-path-for, audio-utils) \

core/jni/android_net_NetUtils.cpp

diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp
index 991b43f..9092512 100644
--- a/core/jni/android_net_NetUtils.cpp
+++ b/core/jni/android_net_NetUtils.cpp
@@ -19,7 +19,6 @@
 #include "jni.h"
 #include "JNIHelp.h"
 #include "NetdClient.h"
-#include "resolv_netid.h"
 #include <utils/misc.h>
 #include <android_runtime/AndroidRuntime.h>
 #include <utils/Log.h>