diff options
| author | Narayan Kamath <narayan@google.com> | 2014-12-31 10:08:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-31 10:08:49 +0000 |
| commit | 38c2dae5f12003ff39a5b1a5e46f079174fcedca (patch) | |
| tree | b49a8ceebd759560be2d515e6e02e9eff09f4143 /core | |
| parent | 72d33849fea5de45087bfa79e645fa282ce8fcef (diff) | |
| parent | bc2cc2f350473d5427dc1db661f7c3931f2a760c (diff) | |
| download | frameworks_base-38c2dae5f12003ff39a5b1a5e46f079174fcedca.zip frameworks_base-38c2dae5f12003ff39a5b1a5e46f079174fcedca.tar.gz frameworks_base-38c2dae5f12003ff39a5b1a5e46f079174fcedca.tar.bz2 | |
Merge "Remove hardcoded include paths."
Diffstat (limited to 'core')
| -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 2d54742..d070c97 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 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> |