diff options
| author | 2014-12-31 10:19:00 +0000 | |
|---|---|---|
| committer | 2014-12-31 10:19:00 +0000 | |
| commit | bdc399299edf7f5f86c816dafe581e85e65dd2bd (patch) | |
| tree | d1c2f10b9dd09a1c1a8a020fd3bd6f6dc609e585 | |
| parent | 342e9030002e5a1c654f3f802e0d6cc0498ac32c (diff) | |
| parent | d3d95172c3645a1d7a12e540638207ae4fb69cae (diff) | |
am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."
* commit 'd3d95172c3645a1d7a12e540638207ae4fb69cae':
Remove hardcoded include paths.
| -rw-r--r-- | core/jni/Android.mk | 4 | ||||
| -rw-r--r-- | core/jni/android_net_NetUtils.cpp | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 2d54742b355d..d070c97e67ca 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -177,11 +177,9 @@ LOCAL_C_INCLUDES += \ $(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 @@ LOCAL_C_INCLUDES += \ 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) \ diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp index 991b43fd28bf..9092512c4320 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> |