drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove hardcoded include paths."

Browse Source
This commit is contained in:
Narayan Kamath
2014-12-31 10:08:47 +00:00
committed by Gerrit Code Review
parent 72d33849fe bc2cc2f350
commit 38c2dae5f1
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/Android.mk
View File

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

1
core/jni/android_net_NetUtils.cpp
View File

@ -19,7 +19,6 @@
#include "jni.h" #include "jni.h"
#include "JNIHelp.h" #include "JNIHelp.h"
#include "NetdClient.h" #include "NetdClient.h"
#include "resolv_netid.h"
#include <utils/misc.h> #include <utils/misc.h>
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include <utils/Log.h> #include <utils/Log.h>