diff options
| author | 2014-12-30 11:53:25 +0000 | |
|---|---|---|
| committer | 2014-12-31 10:06:51 +0000 | |
| commit | bc2cc2f350473d5427dc1db661f7c3931f2a760c (patch) | |
| tree | 85a14bf2cf5264b7754dbb7a82d7ec1318d110b2 | |
| parent | cfa31a605cda26a556009ddd4eae83085e74339b (diff) | |
Remove hardcoded include paths.
ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS.
The dependency on libc/dns/include was bogus and can be removed
trivially.
bug: 18581021
Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18
| -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> |