Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d5ba653 authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

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

automerge: bdc39929

* commit 'bdc39929':
  Remove hardcoded include paths.
parents 3979c0bf bdc39929

core/jni/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -173,11 +173,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 \
@@ -187,11 +185,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) \

core/jni/android_net_NetUtils.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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>