aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-01-22 19:43:21 -0800
committerColin Cross <ccross@android.com>2014-01-22 19:47:32 -0800
commitd4cea4666768eeadd0d1fde61e8231bba353d8ee (patch)
treec786178eca1c0066b258011c5a219d9c787aaa84
parenta65313f57b59aec6e32949992cac700f86eefdd6 (diff)
downloadiptables-d4cea4666768eeadd0d1fde61e8231bba353d8ee.tar.gz
iptables: remove $(KERNEL_HEADERS) from include path
The kernel headers are already in the include path, and manually adding them again will break on a multiarch build, where the kernel headers may be different for each arch. Change-Id: I20867af3061bbc86d2205f5479c40f6034a61b72
-rw-r--r--extensions/Android.mk3
-rw-r--r--iptables/Android.mk1
-rw-r--r--libiptc/Android.mk2
3 files changed, 0 insertions, 6 deletions
diff --git a/extensions/Android.mk b/extensions/Android.mk
index 02b288f6..e5a49212 100644
--- a/extensions/Android.mk
+++ b/extensions/Android.mk
@@ -34,7 +34,6 @@ MY_intermediates := $(call local-intermediates-dir)
# LOCAL_PATH needed because of dirty #include "blabla.c"
LOCAL_C_INCLUDES:= \
$(LOCAL_PATH)/../include/ \
- $(KERNEL_HEADERS) \
$(MY_intermediates) \
$(LOCAL_PATH)
@@ -98,7 +97,6 @@ MY_intermediates := $(call local-intermediates-dir)
# LOCAL_PATH needed because of dirty #include "blabla.c"
LOCAL_C_INCLUDES:= \
$(LOCAL_PATH)/../include/ \
- $(KERNEL_HEADERS) \
$(MY_intermediates)/ \
$(LOCAL_PATH)/
@@ -162,7 +160,6 @@ MY_intermediates := $(call local-intermediates-dir)
# LOCAL_PATH needed because of dirty #include "blabla.c"
LOCAL_C_INCLUDES:= \
$(LOCAL_PATH)/../include/ \
- $(KERNEL_HEADERS) \
$(MY_intermediates) \
$(LOCAL_PATH)
diff --git a/iptables/Android.mk b/iptables/Android.mk
index f094c9e0..736c59a0 100644
--- a/iptables/Android.mk
+++ b/iptables/Android.mk
@@ -7,7 +7,6 @@ include $(CLEAR_VARS)
LOCAL_C_INCLUDES:= \
$(LOCAL_PATH)/../include/ \
- $(KERNEL_HEADERS) \
LOCAL_CFLAGS:=-DNO_SHARED_LIBS=1
LOCAL_CFLAGS+=-DXTABLES_INTERNAL
diff --git a/libiptc/Android.mk b/libiptc/Android.mk
index 6e31c050..e46ecba9 100644
--- a/libiptc/Android.mk
+++ b/libiptc/Android.mk
@@ -6,7 +6,6 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_C_INCLUDES:= \
- $(KERNEL_HEADERS) \
$(LOCAL_PATH)/../include/
# Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__
@@ -29,7 +28,6 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_C_INCLUDES:= \
- $(KERNEL_HEADERS) \
$(LOCAL_PATH)/../include/
# Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__