Remove problematic headers from x86 android-5 headers.

These files have the same case-insensitive name, and this creates problems
when used on Windows + Cygwin.

Change-Id: I911906c209ad9fca8752ba4cdc9c65abdd0bd4a9

diff --git a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_CONNMARK.h b/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_CONNMARK.h
deleted file mode 100644 (file)
index 1b30eeb..0000000
--- a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_CONNMARK.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _XT_CONNMARK_H_target
-#define _XT_CONNMARK_H_target
-
-enum {
- XT_CONNMARK_SET = 0,
- XT_CONNMARK_SAVE,
- XT_CONNMARK_RESTORE
-};
-
-struct xt_connmark_target_info {
- unsigned long mark;
- unsigned long mask;
- u_int8_t mode;
-};
-
-#endif

diff --git a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_MARK.h b/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_MARK.h
deleted file mode 100644 (file)
index f58c97c..0000000
--- a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_MARK.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _XT_MARK_H_target
-#define _XT_MARK_H_target
-
-struct xt_mark_target_info {
- unsigned long mark;
-};
-
-enum {
- XT_MARK_SET=0,
- XT_MARK_AND,
- XT_MARK_OR,
-};
-
-struct xt_mark_target_info_v1 {
- unsigned long mark;
- u_int8_t mode;
-};
-
-#endif

diff --git a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_connmark.h b/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_connmark.h
deleted file mode 100644 (file)
index 021e03a..0000000
--- a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_connmark.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _XT_CONNMARK_H
-#define _XT_CONNMARK_H
-
-struct xt_connmark_info {
- unsigned long mark, mask;
- u_int8_t invert;
-};
-
-#endif

diff --git a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_mark.h b/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_mark.h
deleted file mode 100644 (file)
index 69699df..0000000
--- a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter/xt_mark.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _XT_MARK_H
-#define _XT_MARK_H
-
-struct xt_mark_info {
- unsigned long mark, mask;
- u_int8_t invert;
-};
-
-#endif

diff --git a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_HL.h b/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_HL.h
deleted file mode 100644 (file)
index 1071ff9..0000000
--- a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_HL.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _IP6T_HL_H
-#define _IP6T_HL_H
-
-enum {
- IP6T_HL_SET = 0,
- IP6T_HL_INC,
- IP6T_HL_DEC
-};
-
-#define IP6T_HL_MAXMODE IP6T_HL_DEC
-
-struct ip6t_HL_info {
- u_int8_t mode;
- u_int8_t hop_limit;
-};
-
-#endif

diff --git a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_hl.h b/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_hl.h
deleted file mode 100644 (file)
index e0144d2..0000000
--- a/ndk/build/platforms/android-5/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_hl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _IP6T_HL_H
-#define _IP6T_HL_H
-
-enum {
- IP6T_HL_EQ = 0,
- IP6T_HL_NE,
- IP6T_HL_LT,
- IP6T_HL_GT,
-};
-
-struct ip6t_hl_info {
- u_int8_t mode;
- u_int8_t hop_limit;
-};
-
-#endif