aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-07-24 21:47:34 +0100
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-07-24 21:47:34 +0100
commitf5c36f4343c9704ab38421b602993ee7a2f83f66 (patch)
tree39674095ed5c81ce4474a36eca0abada37b90550
parentf145162f3afe38720a6b53d77d453a7b2365703f (diff)
parentbeb41ac35ff4257c5eed722dee64122339117c01 (diff)
downloadandroid_external_iproute2-cm-10.2.tar.gz
android_external_iproute2-cm-10.2.tar.bz2
android_external_iproute2-cm-10.2.zip
Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2
Android 4.3 release 2.1
-rw-r--r--ip/Android.mk4
-rw-r--r--lib/Android.mk4
-rw-r--r--tc/Android.mk4
3 files changed, 6 insertions, 6 deletions
diff --git a/ip/Android.mk b/ip/Android.mk
index 6562143..cedc7f5 100644
--- a/ip/Android.mk
+++ b/ip/Android.mk
@@ -15,9 +15,9 @@ LOCAL_SHARED_LIBRARIES := libc libm libdl
LOCAL_SHARED_LIBRARIES += libiprouteutil libnetlink
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) external/iproute2/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
-LOCAL_CFLAGS := -O2 -g -W -Wall
+LOCAL_CFLAGS := -O2 -g -W -Wall
LOCAL_LDFLAGS := -Wl,-export-dynamic -Wl,--no-gc-sections
diff --git a/lib/Android.mk b/lib/Android.mk
index 76af7f1..f6143b4 100644
--- a/lib/Android.mk
+++ b/lib/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := utils.c rt_names.c ll_types.c ll_proto.c ll_addr.c inet_proto.c
LOCAL_MODULE := libiprouteutil
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) external/iproute2/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
LOCAL_CFLAGS := -O2 -g -W -Wall \
-DHAVE_UNISTD_H \
-DHAVE_ERRNO_H \
@@ -33,7 +33,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := ll_map.c libnetlink.c
LOCAL_MODULE := libnetlink
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) external/iproute2/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
LOCAL_CFLAGS := -O2 -g -W -Wall \
-DHAVE_UNISTD_H \
-DHAVE_ERRNO_H \
diff --git a/tc/Android.mk b/tc/Android.mk
index ecdaf88..07150e9 100644
--- a/tc/Android.mk
+++ b/tc/Android.mk
@@ -12,9 +12,9 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := \
LOCAL_SHARED_LIBRARIES += libiprouteutil libnetlink
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) external/iproute2/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
-LOCAL_CFLAGS := -O2 -g -W -Wall
+LOCAL_CFLAGS := -O2 -g -W -Wall
include $(BUILD_EXECUTABLE)