Merge change 5763 into donut
* changes: Remove problematic case-insensitive duplicate files. Add missing copyright/license disclaimer to build/tools/make-release.sh Add a new tool: build/tools/find-case-duplicates.sh
This commit is contained in:
Android (Google) Code Review
@@ -1 +0,0 @@
|
|||||||
../../../../../common/include/linux/netfilter/xt_CONNMARK.h
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
../../../../../common/include/linux/netfilter/xt_MARK.h
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
../../../../../common/include/linux/netfilter/xt_connmark.h
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
../../../../../common/include/linux/netfilter/xt_mark.h
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
../../../../../common/include/linux/netfilter_ipv6/ip6t_HL.h
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
../../../../../common/include/linux/netfilter_ipv6/ip6t_hl.h
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
43
ndk/build/tools/find-case-duplicates.sh
Executable file
43
ndk/build/tools/find-case-duplicates.sh
Executable file
@@ -0,0 +1,43 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Copyright (C) 2009 The Android Open Source Project
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
|
||||||
|
# This script is used to find case-insensitive duplicate file names
|
||||||
|
# from the git repository. This is used to remove them when generating
|
||||||
|
# a new sysroot.
|
||||||
|
|
||||||
|
# location of the root ndk directory. we assume this script is under build/tools
|
||||||
|
NDK_ROOT_DIR=`dirname $0`/../..
|
||||||
|
NDK_ROOT_DIR=`cd $NDK_ROOT_DIR && pwd`
|
||||||
|
|
||||||
|
ORG_FILES=`(cd $NDK_ROOT_DIR && git ls-files) | sort -f`
|
||||||
|
NEW_FILES=
|
||||||
|
|
||||||
|
PREVFILE=
|
||||||
|
PREVUPFILE=XXXXXX
|
||||||
|
for FILE in $ORG_FILES; do
|
||||||
|
# don't use [:lower:] and [:upper:] since they can produce
|
||||||
|
# strange results based on the current locale.
|
||||||
|
UPFILE=`echo $FILE | tr [a-z] [A-Z]`
|
||||||
|
if [ "$UPFILE" != "$PREVUPFILE" ] ; then
|
||||||
|
NEW_FILES="$NEW_FILES $FILE"
|
||||||
|
else
|
||||||
|
echo "$PREVFILE"
|
||||||
|
echo "$FILE"
|
||||||
|
fi
|
||||||
|
PREVFILE=$FILE
|
||||||
|
PREVUPFILE=$UPFILE
|
||||||
|
done
|
||||||
@@ -1,5 +1,19 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
|
# Copyright (C) 2009 The Android Open Source Project
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
# This script is used to build complete Android NDK release packages
|
# This script is used to build complete Android NDK release packages
|
||||||
# from the git repository and a set of prebuilt cross-toolchain tarballs
|
# from the git repository and a set of prebuilt cross-toolchain tarballs
|
||||||
#
|
#
|
||||||
|
|||||||
Reference in New Issue
Block a user