Elliott Hughes
1087e0df4f
am 731f7c2d
: am 9d476716
: Merge "Add <sys/statvfs.h>."
...
* commit '731f7c2d0e531d5e0ecdd771d743053f8d093e16':
Add <sys/statvfs.h>.
2013-07-11 10:16:32 -07:00
Nick Kralevich
d30877ae28
Merge "syslog.h: add __printflike to syslog functions"
2013-07-11 15:32:49 +00:00
Nick Kralevich
6b1dd1797e
syslog.h: add __printflike to syslog functions
...
Allow the compiler to detect formating bugs.
Change-Id: I6a4af6cae59dc3adf14b075431a41885213a649a
2013-07-10 07:37:11 -07:00
Elliott Hughes
09f561b38b
am b7f49237
: Merge "Fix MIPS build."
...
* commit 'b7f492375291306065472b67011eebb324de1022':
Fix MIPS build.
2013-07-09 14:21:50 -07:00
Elliott Hughes
b7f4923752
Merge "Fix MIPS build."
2013-07-09 21:19:15 +00:00
Elliott Hughes
6184c1feaa
Fix MIPS build.
...
Change-Id: I583b1794dbc12fcded8c4f57f367593a742ab33f
2013-07-09 14:18:36 -07:00
Elliott Hughes
731f7c2d0e
am 9d476716
: Merge "Add <sys/statvfs.h>."
...
* commit '9d476716c2bd7bc5a018a71e121257c35e965058':
Add <sys/statvfs.h>.
2013-07-09 13:44:57 -07:00
Elliott Hughes
9d476716c2
Merge "Add <sys/statvfs.h>."
2013-07-09 20:43:13 +00:00
Elliott Hughes
06040fd75c
Add <sys/statvfs.h>.
...
Bug: 2512019
Change-Id: I6e7fd3fa281977cc4bc270481a95416b5b2dc351
2013-07-09 13:25:03 -07:00
Chad Brubaker
c39214e0ac
Add marking of DNS sockets for mark based routing
...
Adds an extra mark parameter to android_getaddrinfoforiface,
android_gethostbyaddrforiface and android_gethostbynameforiface that if set
will cause all packets sent by DNS requests to have that mark
Change-Id: I6f72390e4ce5bfc3cc73183f9b2fb3705a11685f
2013-07-09 13:16:22 -07:00
The Android Automerger
b89a334df8
merge in klp-release history after reset to master
2013-07-09 06:00:16 -07:00
Elliott Hughes
273df910b5
am f3f72e7f
: am 4fc8a0c1
: Merge "Remove <netinet/icmp6.h> ni_* macros."
...
* commit 'f3f72e7f277215e9fede7c6f6695654cf7aa0c63':
Remove <netinet/icmp6.h> ni_* macros.
2013-07-08 15:13:35 -07:00
Elliott Hughes
4df412cba6
am 74b06f8d
: am ff145277
: Merge "Upgrade to tzdata2013d."
...
* commit '74b06f8ddcaaa48c7bab418d15aacaf513423ac3':
Upgrade to tzdata2013d.
2013-07-08 15:09:57 -07:00
Elliott Hughes
f3f72e7f27
am 4fc8a0c1
: Merge "Remove <netinet/icmp6.h> ni_* macros."
...
* commit '4fc8a0c1165537b693c900ac3e2c61470bd7e484':
Remove <netinet/icmp6.h> ni_* macros.
2013-07-08 15:09:07 -07:00
Elliott Hughes
4fc8a0c116
Merge "Remove <netinet/icmp6.h> ni_* macros."
2013-07-08 22:08:12 +00:00
Elliott Hughes
c2cd33efc4
Remove <netinet/icmp6.h> ni_* macros.
...
glibc doesn't have these, and they prevent ping from building out of
the box because it assumes it can define them.
Bug: 9671560
Change-Id: I815f2a9c4fd96a0ea2952eb5a71ddf51e0763660
2013-07-08 15:07:41 -07:00
Elliott Hughes
74b06f8ddc
am ff145277
: Merge "Upgrade to tzdata2013d."
...
* commit 'ff145277da9b7fe3d48a27839fc1d6f2ed11604b':
Upgrade to tzdata2013d.
2013-07-08 14:55:41 -07:00
Elliott Hughes
ff145277da
Merge "Upgrade to tzdata2013d."
2013-07-08 21:53:02 +00:00
Elliott Hughes
5149de09ad
Upgrade to tzdata2013d.
...
From the release notes:
Changes affecting future time stamps:
Morocco's midsummer transitions this year are July 7 and August 10,
not July 9 and August 8. (Thanks to Andrew Paprocki.)
Israel now falls back on the last Sunday of October.
(Thanks to Ephraim Silverberg.)
Changes affecting past time stamps:
Specify Jerusalem's location more precisely; this changes the pre-1880
times by 2 s.
Changing affecting metadata only:
Fix typos in the entries for country codes BQ and SX.
Change-Id: I87f992e4c406d4f254dc274f206536e9484024a2
2013-07-08 14:51:15 -07:00
Elliott Hughes
f33dce1ab6
am 233050b1
: am e31c45c9
: Merge "Make bionic\'s <netinet/icmp6.h> standalone, like glibc\'s."
...
* commit '233050b15ec3ce0db534ec6cc24a6061559993d2':
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
2013-07-08 11:27:53 -07:00
Elliott Hughes
233050b15e
am e31c45c9
: Merge "Make bionic\'s <netinet/icmp6.h> standalone, like glibc\'s."
...
* commit 'e31c45c9fa5e0d2853941282e619b753550b82ae':
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
2013-07-08 11:21:53 -07:00
Elliott Hughes
e31c45c9fa
Merge "Make bionic's <netinet/icmp6.h> standalone, like glibc's."
2013-07-08 18:17:57 +00:00
Elliott Hughes
3a040d8379
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
...
This removes the need for a bionic-specific hack in external/iproute2.
Bug: 9671560
Change-Id: I9f15be0711d26bca863bd66be9a39606500fb948
2013-07-08 11:16:24 -07:00
Elliott Hughes
b1397f97f1
am 62bdd031
: am 6b33f31b
: Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."
...
* commit '62bdd03120286708d8c1562eadf5dda00e24911c':
Fix IPv6 filtering definitions in netinet/icmp6.h.
2013-07-08 10:38:41 -07:00
Elliott Hughes
62bdd03120
am 6b33f31b
: Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."
...
* commit '6b33f31b0994b8132bed8936685522e2e01754d8':
Fix IPv6 filtering definitions in netinet/icmp6.h.
2013-07-08 10:34:41 -07:00
Elliott Hughes
6b33f31b09
Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."
2013-07-08 17:32:17 +00:00
Lorenzo Colitti
bfc6a59556
Fix IPv6 filtering definitions in netinet/icmp6.h.
...
Linux and *BSD kernels use opposite values to indicate pass/block
in ICMPv6 filters, and assign a different value to the
ICMP6_FILTER sockopt.
Bug: 9671560
Bug: 9469682
Change-Id: Ic0f1fcd48891add992acf97632f60aebd172c1d7
2013-07-08 10:31:29 -07:00
Elliott Hughes
b611d36c3a
am 24400ac1
: am e63ea6ac
: Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
...
* commit '24400ac1e390615ebcb45deacc1c9213b00f75ff':
Clean up <sys/mount.h>/<linux/fs.h> duplication.
2013-07-08 10:17:38 -07:00
Elliott Hughes
24400ac1e3
am e63ea6ac
: Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
...
* commit 'e63ea6aca7d01ba9219b877ed5fab6de5c6037fb':
Clean up <sys/mount.h>/<linux/fs.h> duplication.
2013-07-08 10:12:32 -07:00
Elliott Hughes
e63ea6aca7
Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
2013-07-08 17:08:52 +00:00
The Android Automerger
1456ec759c
merge in klp-release history after reset to master
2013-07-08 06:00:29 -07:00
Elliott Hughes
e42e51d563
Clean up <sys/mount.h>/<linux/fs.h> duplication.
...
Roll on uapi...
Bug: 6340120
Change-Id: Ic9521905683946e836574e4d768e34853ea777fa
2013-07-03 14:58:04 -07:00
Nick Kralevich
20cb10824b
am 601f968c
: am 84983592
: Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
...
* commit '601f968cedf015c060de8dcf21e7e10bf596901f':
bionic_atomic_arm.h: Remove < ARMv6 support
2013-07-03 14:33:22 -07:00
Nick Kralevich
601f968ced
am 84983592
: Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
...
* commit '84983592ade3ec7d72d082262fb6646849979bfc':
bionic_atomic_arm.h: Remove < ARMv6 support
2013-07-03 14:28:14 -07:00
Nick Kralevich
84983592ad
Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
2013-07-03 21:25:35 +00:00
Nick Kralevich
e91f71783b
bionic_atomic_arm.h: Remove < ARMv6 support
...
This is dead code for most modern Android devices.
Bug: 9674955
Change-Id: Ic63a66b0331a0f07b9183f14a1d5e678c25e4b12
2013-07-03 14:14:06 -07:00
Elliott Hughes
1f75ee8606
am a8b954c5
: am de2781d9
: Merge changes I01345c23,I3b57517c
...
* commit 'a8b954c51edd9ec8c09a5d1dccacaadf5869d78a':
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
2013-07-03 13:45:45 -07:00
Elliott Hughes
a8b954c51e
am de2781d9
: Merge changes I01345c23,I3b57517c
...
* commit 'de2781d906f27be4df3e03a8e5041dcc1aeb281d':
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
2013-07-03 13:39:16 -07:00
Elliott Hughes
de2781d906
Merge changes I01345c23,I3b57517c
...
* changes:
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
2013-07-03 20:37:28 +00:00
Lorenzo Colitti
f936ef1a9f
Include linux/termios.h from sys/ioctl.h.
...
On NetBSD and glibc, including sys/ioctl.h provides some
terminal ioctl data structures such as struct winsize. For
compatibility, provide these via sys/ioctl.h in bionic as well.
bionic does not have its own definitions for these structures, so
get them from the Linux kernel definitions.
Change-Id: I01345c23c0bebd60b0a80fc33668e7c0ad7356c3
2013-07-03 13:35:18 -07:00
Lorenzo Colitti
d7b0d6e1e1
Update linux/types.h to linux 2.6.20.
...
This picks up the source kernel header change
I984154487c38f6fa827bd78234f7fc2e4e1c383f .
Bug: 9469682
Change-Id: I3b57517cc6442ba4d0b8003d7398617e8226233f
2013-07-03 13:15:20 -07:00
Elliott Hughes
be438a4c40
am fac9199c
: am ebc8ce1d
: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
...
* commit 'fac9199c7698481805dd9b1adaf89a2584719f4c':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
2013-07-03 10:28:19 -07:00
Elliott Hughes
fac9199c76
am ebc8ce1d
: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
...
* commit 'ebc8ce1de68a83d772106af98c7cb98150bb5662':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
2013-07-03 10:23:41 -07:00
Elliott Hughes
ebc8ce1de6
Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
2013-07-03 17:21:47 +00:00
Will Newton
2753e12af5
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
...
This memcpy code uses NEON/VFP to achieve very good performance
on ARMv7-A processors. It is specifically tuned for A15 but should
provide good performance on A9 also. It is equivalent to the code
in cortex-strings rev 116.
This patch is a follow up the existing gerrit change:
I7f6f77995f3ca903ad9c66d14261441667a2a935
This version includes a tweak for performance on misaligned
buffers and splits the header comment into license and
documentation sections.
Change-Id: Ibd2e23c8d8e01357ba0247be1d05192de3ceba69
Signed-off-by: Will Newton <will.newton@linaro.org>
2013-07-03 10:20:43 -07:00
Elliott Hughes
997368d60d
am 833dc584
: am 87b4286f
: Merge "Expose dn_comp and dn_expand to system C code."
...
* commit '833dc584d4d02ab8e396b877b38a8a5ad8ba4882':
Expose dn_comp and dn_expand to system C code.
2013-07-02 16:05:34 -07:00
Elliott Hughes
833dc584d4
am 87b4286f
: Merge "Expose dn_comp and dn_expand to system C code."
...
* commit '87b4286f092094a2e8069a06e20ef5036a258172':
Expose dn_comp and dn_expand to system C code.
2013-07-02 16:02:30 -07:00
Elliott Hughes
87b4286f09
Merge "Expose dn_comp and dn_expand to system C code."
2013-07-02 23:00:38 +00:00
Lorenzo Colitti
b8e435c1d5
Expose dn_comp and dn_expand to system C code.
...
This is needed to compile open-source code that wants to
expand/compress domain names itself, such as ping6.
Bug: 9469682
Change-Id: I339c6538936d05c031bc6fb0a8793aaf1429dea4
2013-07-02 15:57:57 -07:00
Elliott Hughes
742aad3584
am 7c808b29
: am feec97a7
: Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."
...
* commit '7c808b29d5cea61e5bda90a1b0f2f0e669ee135e':
Fix inttypes.h PRI?PTR and SCN?PTR macros.
2013-07-02 15:50:36 -07:00