OSDN Git Service
Pavel Labath [Tue, 3 May 2016 17:21:39 +0000 (17:21 +0000)]
Merge "Revert "Add a test exercising ptrace watchpoint functionality"" into nyc-dev am:
cd0a8fa09d
am:
9ddf9a6ef6 -s ours
* commit '
9ddf9a6ef6f6419ced8379a803e5cccb4aab449f':
Revert "Add a test exercising ptrace watchpoint functionality"
Change-Id: I6adf7758ebad8ee56030a37b20d59df0cd5505d1
Pavel Labath [Tue, 3 May 2016 16:54:11 +0000 (16:54 +0000)]
Merge "Revert "Add a test exercising ptrace watchpoint functionality"" into nyc-dev
am:
cd0a8fa09d
* commit '
cd0a8fa09d284b49adbb2345821ce481fe369972':
Revert "Add a test exercising ptrace watchpoint functionality"
Change-Id: I72e14bd648e7555043b6acff0f68f0853908d7c3
TreeHugger Robot [Tue, 3 May 2016 16:43:00 +0000 (16:43 +0000)]
Merge "Revert "Add a test exercising ptrace watchpoint functionality"" into nyc-dev
Pavel Labath [Tue, 3 May 2016 14:46:03 +0000 (14:46 +0000)]
Revert "Add a test exercising ptrace watchpoint functionality"
This test appears to be failing on shamu devices. Revert until we figure out what's the problem.
This reverts commit
88ce78d93a465c1c635901d26542d5ec07b6b6ee.
Bug:
28514348
Change-Id: I0d91ca5eb59eb3ccb5d48b02b245e0f1bcffb5bb
Elliott Hughes [Tue, 3 May 2016 01:06:55 +0000 (01:06 +0000)]
Merge "Move <machine/endian.h> somewhere more private." am:
9ee905f12f am:
19da0526bc
am:
54e38cbdb3
* commit '
54e38cbdb362a71eee79f08da9cc06602e66a9b3':
Move <machine/endian.h> somewhere more private.
Change-Id: Iec0c2d7f462849ec4e968c116830f90a862eaf3f
Elliott Hughes [Tue, 3 May 2016 01:04:39 +0000 (01:04 +0000)]
Merge "Move <machine/endian.h> somewhere more private." am:
9ee905f12f
am:
19da0526bc
* commit '
19da0526bca0f441da6085eae2cc10efa52c6775':
Move <machine/endian.h> somewhere more private.
Change-Id: Ia9e2d579798f645e7da19558deb1d56ded7968f9
Elliott Hughes [Tue, 3 May 2016 01:00:05 +0000 (01:00 +0000)]
Merge "Move <machine/endian.h> somewhere more private."
am:
9ee905f12f
* commit '
9ee905f12fa0aeb4ae0df708e15d2ffcfaf58000':
Move <machine/endian.h> somewhere more private.
Change-Id: I93f403f57759e32dc6ca887be6718927ebca0083
Elliott Hughes [Tue, 3 May 2016 00:45:38 +0000 (00:45 +0000)]
Merge "Move <machine/endian.h> somewhere more private."
Colin Cross [Mon, 2 May 2016 23:40:04 +0000 (23:40 +0000)]
Merge "Update Android.bp to match Android.mk" am:
45d3cf9f0f am:
24c1e2df1c
am:
2ffa600c9a
* commit '
2ffa600c9a15a1d98bf7a4f1cbe630c53b51faf8':
Update Android.bp to match Android.mk
Change-Id: I7244cf520e26a29e3a3c286e4764cccf231460f6
Colin Cross [Mon, 2 May 2016 23:34:51 +0000 (23:34 +0000)]
Merge "Update Android.bp to match Android.mk" am:
45d3cf9f0f
am:
24c1e2df1c
* commit '
24c1e2df1ce40583561946ebdb7552e88451bc12':
Update Android.bp to match Android.mk
Change-Id: Ie50fd99a246e583869433866ff112fc1ffb64cea
Colin Cross [Mon, 2 May 2016 23:29:41 +0000 (23:29 +0000)]
Merge "Update Android.bp to match Android.mk"
am:
45d3cf9f0f
* commit '
45d3cf9f0f48594c4c092d3aef05f82639216ebd':
Update Android.bp to match Android.mk
Change-Id: Ic818be033bbc0d85cb7ae34559b2d5595ca1ea95
Treehugger Robot [Mon, 2 May 2016 23:19:20 +0000 (23:19 +0000)]
Merge "Update Android.bp to match Android.mk"
Elliott Hughes [Mon, 2 May 2016 23:09:26 +0000 (23:09 +0000)]
Merge "Move glibc-syscalls.h into bits/." am:
3338ee5257 am:
4ce2c90739
am:
2e1177fcdc
* commit '
2e1177fcdcd8be2156d2542aaffb7a600cf8cb6d':
Move glibc-syscalls.h into bits/.
Change-Id: Ia0b5590b266288365c5d6e0493ac7cfa6cf392f1
Elliott Hughes [Mon, 2 May 2016 23:04:43 +0000 (23:04 +0000)]
Merge "Move glibc-syscalls.h into bits/." am:
3338ee5257
am:
4ce2c90739
* commit '
4ce2c9073974b7837b9e97f9f55c555f21204ccf':
Move glibc-syscalls.h into bits/.
Change-Id: If515c3f4b7fa8791a84e534bb626d3690d12e10a
Elliott Hughes [Mon, 2 May 2016 22:59:22 +0000 (22:59 +0000)]
Merge "Move glibc-syscalls.h into bits/."
am:
3338ee5257
* commit '
3338ee52576632fd96bc131c6e943fa6f9a62139':
Move glibc-syscalls.h into bits/.
Change-Id: Iaf9406a2ccf84c80685fcc4ce6000338d0721543
Elliott Hughes [Mon, 2 May 2016 21:55:28 +0000 (14:55 -0700)]
Move <machine/endian.h> somewhere more private.
Bug: http://b/
28519060
Change-Id: I1c7811f95f46c65d4152bcf509b6e048c45bc28b
Elliott Hughes [Mon, 2 May 2016 22:41:34 +0000 (22:41 +0000)]
Merge "Move glibc-syscalls.h into bits/."
Elliott Hughes [Mon, 2 May 2016 21:54:50 +0000 (21:54 +0000)]
Merge "Remove <sys/utime.h>." am:
3fb1b37bba am:
d616ea2081
am:
680e7fd49f
* commit '
680e7fd49f6ad16025dd290b8dfc473ec895acb3':
Remove <sys/utime.h>.
Change-Id: Ida9aa0cb4f0e24a349860fe8c12c3fa9137971ae
Elliott Hughes [Mon, 2 May 2016 21:52:38 +0000 (21:52 +0000)]
Merge "Remove <sys/utime.h>." am:
3fb1b37bba
am:
d616ea2081
* commit '
d616ea2081097b6c5a10dbb1e0d27c0a593c2361':
Remove <sys/utime.h>.
Change-Id: I4030dc76eaf83a690a3f81f17a37e8d7c42f22f1
Elliott Hughes [Mon, 2 May 2016 21:52:18 +0000 (21:52 +0000)]
Merge "Move the IEEE fp header out of the public headers." am:
d3b4166b5b am:
4146ea5a68
am:
cd8266a4bd
* commit '
cd8266a4bd94dcac9e3dafd3795c74cb3761dfaf':
Move the IEEE fp header out of the public headers.
Change-Id: If842735da13d7fd2425398b72011f486c5ccd0da
Elliott Hughes [Mon, 2 May 2016 21:47:08 +0000 (21:47 +0000)]
Merge "Remove <sys/utime.h>."
am:
3fb1b37bba
* commit '
3fb1b37bbae91652f2fe93fde1284e80f2d57937':
Remove <sys/utime.h>.
Change-Id: I38b5e309146dc708ccefaee9751c7f413a481bf9
Elliott Hughes [Mon, 2 May 2016 21:41:35 +0000 (21:41 +0000)]
Merge "Move the IEEE fp header out of the public headers." am:
d3b4166b5b
am:
4146ea5a68
* commit '
4146ea5a685bfef5b4c799c16241085d583e3c51':
Move the IEEE fp header out of the public headers.
Change-Id: I64b594d96c8b25610ba15ffdc31e05eeecfbdce4
Elliott Hughes [Mon, 2 May 2016 21:36:42 +0000 (21:36 +0000)]
Merge "Move nsswitch.h into libc/dns/include." am:
eb9b0a1819 am:
95915bdab9
am:
d3eed62477
* commit '
d3eed6247706ed906f24f23049fbfaacf31c577a':
Move nsswitch.h into libc/dns/include.
Change-Id: Ia0c14994f05ce847d8aa5477ef1ed9f13c1a7dd2
Elliott Hughes [Mon, 2 May 2016 21:36:41 +0000 (21:36 +0000)]
Merge "Remove <net/if_ieee1394.h>." am:
af5afdba34 am:
acb5ffc6b3
am:
c6355f7f4c
* commit '
c6355f7f4c3fc72db32a37a98ba6bda9a54add67':
Remove <net/if_ieee1394.h>.
Change-Id: I2f5d9f577755d011756f9e5b0aad9ca955cb473c
Elliott Hughes [Mon, 2 May 2016 21:36:40 +0000 (21:36 +0000)]
Merge "Remove <sys/ioctl_compat.h>." am:
5ab6f6c3bd am:
ca9953a31a
am:
83bdc795d0
* commit '
83bdc795d0c70aef2a5c3cd97419f3508f458c1b':
Remove <sys/ioctl_compat.h>.
Change-Id: Ibe44094c807337fe28f93d7f4aa9dbeba7af4907
Elliott Hughes [Mon, 2 May 2016 21:36:39 +0000 (21:36 +0000)]
Merge "Move the IEEE fp header out of the public headers."
am:
d3b4166b5b
* commit '
d3b4166b5bd9b3532cf686d7f19a608f78a65453':
Move the IEEE fp header out of the public headers.
Change-Id: Id61a467cbcee3939d86ded96cefd57937276d869
Elliott Hughes [Mon, 2 May 2016 21:35:14 +0000 (21:35 +0000)]
Merge "Remove <sys/utime.h>."
Elliott Hughes [Mon, 2 May 2016 21:31:03 +0000 (21:31 +0000)]
Merge "Move nsswitch.h into libc/dns/include." am:
eb9b0a1819
am:
95915bdab9
* commit '
95915bdab9dd3f43ebd4db7f33a3de214e348afe':
Move nsswitch.h into libc/dns/include.
Change-Id: I047b4b4e5a0c8edf5b4f79f12d1656c503c4c3f5
Elliott Hughes [Mon, 2 May 2016 21:31:01 +0000 (21:31 +0000)]
Merge "Remove <net/if_ieee1394.h>." am:
af5afdba34
am:
acb5ffc6b3
* commit '
acb5ffc6b37415efd582db61df6d94d813eb13c8':
Remove <net/if_ieee1394.h>.
Change-Id: I6a742a40004f77c4ed3df6c8f4210fd403ad0cde
Elliott Hughes [Mon, 2 May 2016 21:31:00 +0000 (21:31 +0000)]
Merge "Remove <sys/ioctl_compat.h>." am:
5ab6f6c3bd
am:
ca9953a31a
* commit '
ca9953a31a889e19ee88eddf994dd361ee4af3e4':
Remove <sys/ioctl_compat.h>.
Change-Id: I061d26e0a6d188b8a289b9369a1547efec0546dd
Elliott Hughes [Mon, 2 May 2016 21:25:57 +0000 (21:25 +0000)]
Merge "Move nsswitch.h into libc/dns/include."
am:
eb9b0a1819
* commit '
eb9b0a181930bf1e63019343fe63e2e08ba03b69':
Move nsswitch.h into libc/dns/include.
Change-Id: I201d4c0efecbdff11087b70a556ee8e12ee39304
Elliott Hughes [Mon, 2 May 2016 21:25:56 +0000 (21:25 +0000)]
Merge "Remove <net/if_ieee1394.h>."
am:
af5afdba34
* commit '
af5afdba34619ef1b6286b0d7d9a54ad998420fb':
Remove <net/if_ieee1394.h>.
Change-Id: I0eea42b389bec443b4d1962f4f2e78a0c0ef5fd0
Elliott Hughes [Mon, 2 May 2016 21:25:55 +0000 (21:25 +0000)]
Merge "Remove <sys/ioctl_compat.h>."
am:
5ab6f6c3bd
* commit '
5ab6f6c3bdceb9e17a29cd35586b7b2bd3e6ab53':
Remove <sys/ioctl_compat.h>.
Change-Id: I1590c204cefb5f0f42c18e78980dcec5e26ed1f1
Elliott Hughes [Mon, 2 May 2016 21:22:31 +0000 (21:22 +0000)]
Merge "Move the IEEE fp header out of the public headers."
Elliott Hughes [Mon, 2 May 2016 21:11:30 +0000 (21:11 +0000)]
Merge "Move nsswitch.h into libc/dns/include."
Elliott Hughes [Mon, 2 May 2016 21:11:10 +0000 (21:11 +0000)]
Merge "Remove <net/if_ieee1394.h>."
Elliott Hughes [Mon, 2 May 2016 21:07:13 +0000 (21:07 +0000)]
Merge "Remove <sys/ioctl_compat.h>."
Elliott Hughes [Mon, 2 May 2016 20:24:15 +0000 (20:24 +0000)]
Merge "Remove unused <sys/socketcalls.h> header." am:
d3f51a482f am:
f016491373
am:
fd75024866
* commit '
fd750248662b4a05fd0f17ca7cb6c4c3ff2e2e35':
Remove unused <sys/socketcalls.h> header.
Change-Id: I64fddbee9705c083c9749675adc02d8a70a23e75
Elliott Hughes [Mon, 2 May 2016 20:19:35 +0000 (20:19 +0000)]
Merge "Remove unused <sys/socketcalls.h> header." am:
d3f51a482f
am:
f016491373
* commit '
f016491373b5ece75377fb20227d8824f9c757c4':
Remove unused <sys/socketcalls.h> header.
Change-Id: Ie2b5979fc142e7feb9b574e9813994f1a34908fd
Elliott Hughes [Mon, 2 May 2016 20:14:47 +0000 (20:14 +0000)]
Merge "Remove unused <sys/socketcalls.h> header."
am:
d3f51a482f
* commit '
d3f51a482f196cd29e6da0db2f8513670e9a66cf':
Remove unused <sys/socketcalls.h> header.
Change-Id: I7716e09ec30f03dbede30ba6cfe2ef9214856644
Elliott Hughes [Mon, 2 May 2016 20:13:49 +0000 (13:13 -0700)]
Remove <sys/utime.h>.
As far as I can tell, this is a Windows-ism.
Bug: http://b/
28519060
Change-Id: I28ca39ba799aaae81695eff3ce57eacb326e941c
Elliott Hughes [Mon, 2 May 2016 20:03:53 +0000 (20:03 +0000)]
Merge "Remove unused <sys/socketcalls.h> header."
Elliott Hughes [Mon, 2 May 2016 19:53:00 +0000 (12:53 -0700)]
Remove <sys/ioctl_compat.h>.
This is all legacy BSD stuff (legacy even on BSD!) that's meaningless on Linux.
Bug: http://b/
28519060
Change-Id: I92d317ede844ebd50b48368021fa2ad036e2b0c1
Elliott Hughes [Mon, 2 May 2016 19:47:58 +0000 (12:47 -0700)]
Move glibc-syscalls.h into bits/.
Bug: http://b/
28519060
Change-Id: I0de1ba16b16eb7b780de89954d3fa45cca2f5295
Elliott Hughes [Mon, 2 May 2016 19:44:41 +0000 (12:44 -0700)]
Move the IEEE fp header out of the public headers.
Bug: http://b/
28519060
Change-Id: I9f1a1a9ac1f22462bf86991b57c51824cb42eefd
Elliott Hughes [Mon, 2 May 2016 19:35:26 +0000 (12:35 -0700)]
Remove <net/if_ieee1394.h>.
It's 2016.
Bug: http://b/
28519060
Change-Id: Idbb2c40f37e57a87933b8b13b20e15035105e918
Elliott Hughes [Mon, 2 May 2016 19:24:58 +0000 (12:24 -0700)]
Move nsswitch.h into libc/dns/include.
Not a public header file except in NetBSD, where it came from. Even
OpenBSD doesn't have it.
Bug: http://b/
28519060
Change-Id: Id5feec4a4e8010a9f4433e73b1bfa6f935d884b9
Josh Gao [Mon, 2 May 2016 18:58:02 +0000 (18:58 +0000)]
Merge changes I25dca710,I85fdf927,I667fe53e,I46bf95ac am:
583a4f8d35 am:
0910c25811
am:
e96d0485af
* commit '
e96d0485afbbf78e666e89db41e552f701568742':
Remove nonexported _ns_flagdata from public header.
Add platform specific version tags.
Add __INTRODUCED_IN_FUTURE for unreleased APIs.
Add versioning information to symbols.
Change-Id: I8c822bea398332b6929883280950ee3411b1c591
Josh Gao [Mon, 2 May 2016 18:53:31 +0000 (18:53 +0000)]
Merge changes I25dca710,I85fdf927,I667fe53e,I46bf95ac am:
583a4f8d35
am:
0910c25811
* commit '
0910c258110cdb36ab4dfb67f7c0c6f248100fb6':
Remove nonexported _ns_flagdata from public header.
Add platform specific version tags.
Add __INTRODUCED_IN_FUTURE for unreleased APIs.
Add versioning information to symbols.
Change-Id: Ia45ce4f55f24985ff6c1cc17d7ade2004611fa21
Josh Gao [Mon, 2 May 2016 18:49:06 +0000 (18:49 +0000)]
Merge changes I25dca710,I85fdf927,I667fe53e,I46bf95ac
am:
583a4f8d35
* commit '
583a4f8d35d1de3e0e4d300d75a578b6bdc3b47a':
Remove nonexported _ns_flagdata from public header.
Add platform specific version tags.
Add __INTRODUCED_IN_FUTURE for unreleased APIs.
Add versioning information to symbols.
Change-Id: I544c8c9d23ed21b454cb98e46f36bbd14269f9e7
Josh Gao [Mon, 2 May 2016 18:33:04 +0000 (18:33 +0000)]
Merge changes I25dca710,I85fdf927,I667fe53e,I46bf95ac
* changes:
Remove nonexported _ns_flagdata from public header.
Add platform specific version tags.
Add __INTRODUCED_IN_FUTURE for unreleased APIs.
Add versioning information to symbols.
Elliott Hughes [Mon, 2 May 2016 15:09:37 +0000 (08:09 -0700)]
Remove unused <sys/socketcalls.h> header.
These constants come from <linux/net.h> on Linux.
Change-Id: I546fadac2478771c2455298d776dbc4a20c73b17
Elliott Hughes [Mon, 2 May 2016 15:00:09 +0000 (15:00 +0000)]
Merge "Fix various empty .h files in bionic." am:
ec4671928c am:
ae76af4962
am:
d8892af6dd
* commit '
d8892af6dd99cd0bab9a3bcb616a1008e09f554e':
Fix various empty .h files in bionic.
Change-Id: I93a2b3cbf4c44be3174c172dae6c0f730d597d3e
Elliott Hughes [Mon, 2 May 2016 14:55:44 +0000 (14:55 +0000)]
Merge "Fix various empty .h files in bionic." am:
ec4671928c
am:
ae76af4962
* commit '
ae76af4962750936c5c9b4c65933299145fd2ca1':
Fix various empty .h files in bionic.
Change-Id: I3d7996f593daf7248b8ab96a5d11e37de8da3fe1
Elliott Hughes [Mon, 2 May 2016 14:51:32 +0000 (14:51 +0000)]
Merge "Fix various empty .h files in bionic."
am:
ec4671928c
* commit '
ec4671928c39b14f7f22c12ffef0e0bcdd58edfe':
Fix various empty .h files in bionic.
Change-Id: I50eec4dc6467e591bca7a80078834cf5a0dae191
Elliott Hughes [Mon, 2 May 2016 14:43:01 +0000 (14:43 +0000)]
Merge "Fix various empty .h files in bionic."
Android Build Merger (Role) [Mon, 2 May 2016 13:00:04 +0000 (13:00 +0000)]
Merge "Merge "Record the resolution start time on errors." into nyc-dev am:
ad59ec1da8 am:
5e662cad0f" into nyc-mr1-dev-plus-aosp
Lorenzo Colitti [Mon, 2 May 2016 12:59:49 +0000 (12:59 +0000)]
Merge "Record the resolution start time on errors." into nyc-dev am:
ad59ec1da8
am:
5e662cad0f
* commit '
5e662cad0f00904ff753ea5a42ac010a96502551':
Record the resolution start time on errors.
Change-Id: I0ffe55c4c7296c74e3757a7d1c215bfb7788638d
Lorenzo Colitti [Mon, 2 May 2016 12:59:48 +0000 (12:59 +0000)]
Merge "Record the resolution start time on errors." into nyc-dev am:
ad59ec1da8
am:
1a5eee0ec8
* commit '
1a5eee0ec8d8d3e73bf59d4fdd1a284819889f2f':
Record the resolution start time on errors.
Change-Id: I9d925b098ed008997028beab5c788dee612380d3
Pierre Imai [Mon, 2 May 2016 12:55:41 +0000 (12:55 +0000)]
Merge "Record the resolution start time on errors." into nyc-dev
am:
ad59ec1da8
* commit '
ad59ec1da8df80bb56c76a5f14a3d7aef1e6d1c9':
Record the resolution start time on errors.
Change-Id: I4d1e0f2c6135d6a1547b379fc7d0cada869001dd
Pierre Imai [Mon, 2 May 2016 12:55:41 +0000 (12:55 +0000)]
Merge "Record the resolution start time on errors." into nyc-dev
am:
ad59ec1da8
* commit '
ad59ec1da8df80bb56c76a5f14a3d7aef1e6d1c9':
Record the resolution start time on errors.
Change-Id: I72f121143eab0cae6703c5f302187e06c338a420
Lorenzo Colitti [Mon, 2 May 2016 12:46:17 +0000 (12:46 +0000)]
Merge "Record the resolution start time on errors." into nyc-dev
Pierre Imai [Mon, 2 May 2016 11:46:16 +0000 (11:46 +0000)]
Merge "Record the resolution start time on errors." am:
edfc5d7b74 am:
1ea26abae5
am:
4cb072d686
* commit '
4cb072d68623b903dc89ecacfcdfac15adb9f4d4':
Record the resolution start time on errors.
Change-Id: I146e53e3e549f5bbc89dfdc3bb83ee668508cc8a
Lorenzo Colitti [Mon, 2 May 2016 11:42:08 +0000 (11:42 +0000)]
Merge "Record the resolution start time on errors." am:
edfc5d7b74
am:
1ea26abae5
* commit '
1ea26abae5f72e9509de42061419b6956f79b6b5':
Record the resolution start time on errors.
Change-Id: I13868536d139255210a2e9bb58b7288391e9b5ea
Pierre Imai [Mon, 2 May 2016 11:38:02 +0000 (11:38 +0000)]
Merge "Record the resolution start time on errors."
am:
edfc5d7b74
* commit '
edfc5d7b74d85727557dabc701780b997db96cdd':
Record the resolution start time on errors.
Change-Id: I4592a3c3e7ca1158ee1f9cd0df777dbbcd7f7b16
Lorenzo Colitti [Mon, 2 May 2016 11:28:42 +0000 (11:28 +0000)]
Merge "Record the resolution start time on errors."
Pierre Imai [Wed, 27 Apr 2016 08:30:30 +0000 (17:30 +0900)]
Record the resolution start time on errors.
Also only record samples on the first try for a server.
BUG:
25731675
Change-Id: I10a68813c6636874e63aca1db661e63e1af72a2d
(cherry picked from commit
8b8611a0e6f1928b793c17e80d22c1e2810eadc0)
Pierre Imai [Wed, 27 Apr 2016 08:30:30 +0000 (17:30 +0900)]
Record the resolution start time on errors.
Also only record samples on the first try for a server.
BUG:
25731675
Change-Id: I10a68813c6636874e63aca1db661e63e1af72a2d
Elliott Hughes [Sat, 30 Apr 2016 05:30:19 +0000 (22:30 -0700)]
Fix various empty .h files in bionic.
Bug: http://b/
28432688
Change-Id: I339f5221b9e66ce5983eb3685b9405e8d6f58808
Josh Gao [Sat, 30 Apr 2016 00:58:14 +0000 (00:58 +0000)]
Merge changes I0aa46d9d,I6431111b am:
ee6fb66dc1 am:
f8b63759dd
am:
a18f854409
* commit '
a18f854409a15e16b0b2b8da0eb9bedf591790f3':
Add __INTRODUCED_IN_{32,64}.
Add __INTRODUCED_IN hack to complex test.
Change-Id: Ia9b5aefc96a6c3703f772ad5dd036dde5720ee52
Josh Gao [Sat, 30 Apr 2016 00:55:59 +0000 (00:55 +0000)]
Merge changes I0aa46d9d,I6431111b am:
ee6fb66dc1
am:
f8b63759dd
* commit '
f8b63759dd035e4e235830b996d2cc028869e802':
Add __INTRODUCED_IN_{32,64}.
Add __INTRODUCED_IN hack to complex test.
Change-Id: I22ed91a7b06063632a4219f1d96eff8a08a44ce2
Josh Gao [Sat, 30 Apr 2016 00:53:46 +0000 (00:53 +0000)]
Merge changes I0aa46d9d,I6431111b
am:
ee6fb66dc1
* commit '
ee6fb66dc1a180ce0206a5ea0522000cfcf4c8b1':
Add __INTRODUCED_IN_{32,64}.
Add __INTRODUCED_IN hack to complex test.
Change-Id: I8ea14d0e6897d0bbfc8bee77fc6f4cc7786c90db
Treehugger Robot [Sat, 30 Apr 2016 00:48:38 +0000 (00:48 +0000)]
Merge changes I0aa46d9d,I6431111b
* changes:
Add __INTRODUCED_IN_{32,64}.
Add __INTRODUCED_IN hack to complex test.
Josh Gao [Fri, 29 Apr 2016 21:35:55 +0000 (14:35 -0700)]
Remove nonexported _ns_flagdata from public header.
Bug: http://b/
28178111
Change-Id: I25dca710964099c4e07bf694635db75a72b38508
Josh Gao [Fri, 29 Apr 2016 19:15:18 +0000 (12:15 -0700)]
Add __INTRODUCED_IN_{32,64}.
Some symbols appeared at different times between 32 and 64 bit. Add a
macro to represent this.
Bug: http://b/
28178111
Change-Id: I0aa46d9da3c7301b60df0416bce252f0f37b7b36
Josh Gao [Fri, 29 Apr 2016 23:36:01 +0000 (16:36 -0700)]
Add platform specific version tags.
Some functions were added at different times on different platforms.
This should hopefully get most of them.
Bug: http://b/
28178111
Change-Id: I85fdf92779a2f3277e9b537c6bfc7216790c607a
Josh Gao [Fri, 29 Apr 2016 18:52:39 +0000 (11:52 -0700)]
Add __INTRODUCED_IN hack to complex test.
complex_test.cpp is compiled with both bionic and glibc, so when
__INTRODUCED_IN starts being used in <complex.h>, we'll need this to
keep it building.
Bug: http://b/
28178111
Change-Id: I6431111be35288cad72e9c23ca8599f548b6d906
Josh Gao [Fri, 29 Apr 2016 20:45:25 +0000 (13:45 -0700)]
Add __INTRODUCED_IN_FUTURE for unreleased APIs.
Future API levels aren't known (e.g. 25 could be a maintenance release
of N that doesn't contain any bionic updates), so use a placeholder
macro that we can find and replace with the actual API level before each
release.
Bug: http://b/
28178111
Change-Id: I667fe53ea1ac49b64135170fc30d5dbe9df94e29
Josh Gao [Fri, 29 Apr 2016 19:00:55 +0000 (12:00 -0700)]
Add versioning information to symbols.
Bug: http://b/
28178111
Change-Id: I46bf95accd819f4521afb1173d8badcc5e9df31c
Elliott Hughes [Fri, 29 Apr 2016 22:22:12 +0000 (22:22 +0000)]
Merge "Remove __UNAVAILABLE." am:
e23df93915 am:
5a9efce22d
am:
e3b535e9a7
* commit '
e3b535e9a76efbcb0c1c6ba36e112e272c1b046b':
Remove __UNAVAILABLE.
Change-Id: I21ab9c34a29c8e89adda87737220abd3352cfb8d
Elliott Hughes [Fri, 29 Apr 2016 22:20:05 +0000 (22:20 +0000)]
Merge "Remove __UNAVAILABLE." am:
e23df93915
am:
5a9efce22d
* commit '
5a9efce22dacab89453be3722e73d9781ca2b40d':
Remove __UNAVAILABLE.
Change-Id: Id018e29a6e24a9b11b67465569df126f234374ff
Elliott Hughes [Fri, 29 Apr 2016 22:17:48 +0000 (22:17 +0000)]
Merge "Remove __UNAVAILABLE."
am:
e23df93915
* commit '
e23df93915dd89ae9661dded3c51bfd5a0bd185e':
Remove __UNAVAILABLE.
Change-Id: Iaedcb05c20d8afc5daa501adce75bf36dfedaba6
Elliott Hughes [Fri, 29 Apr 2016 22:12:20 +0000 (22:12 +0000)]
Merge "Remove __UNAVAILABLE."
Colin Cross [Fri, 29 Apr 2016 21:06:07 +0000 (14:06 -0700)]
Update Android.bp to match Android.mk
Change-Id: I6b71d8ee91c550e2d37c88ce2ca088964639d433
Elliott Hughes [Fri, 29 Apr 2016 18:22:41 +0000 (18:22 +0000)]
Merge "Fix <wctype.h>." am:
146cbacea0 am:
005276fd95
am:
302be31045
* commit '
302be31045b7b377532badae2b8e01057d3d6a46':
Fix <wctype.h>.
Change-Id: I877259b6d1322a47c1c8183f595d3a4467631707
Elliott Hughes [Fri, 29 Apr 2016 18:20:29 +0000 (18:20 +0000)]
Merge "Fix <wctype.h>." am:
146cbacea0
am:
005276fd95
* commit '
005276fd959dfd79102c06fc901e7035342facf2':
Fix <wctype.h>.
Change-Id: I0bc876c8f914a48c62493a8595e8e1433846902e
Elliott Hughes [Fri, 29 Apr 2016 18:18:11 +0000 (18:18 +0000)]
Merge "Fix <wctype.h>."
am:
146cbacea0
* commit '
146cbacea0754356a784608474149d291d92500a':
Fix <wctype.h>.
Change-Id: Ica0217c3d10677f3d6d502ffa4ca4f6b8d56226d
Elliott Hughes [Fri, 29 Apr 2016 18:07:55 +0000 (11:07 -0700)]
Remove __UNAVAILABLE.
We fixed the things we needed this for, and should never reintroduce a
similar mistake in future.
Change-Id: I74b447bcf22ea533f3c79db48b66a3c217d76c2f
Elliott Hughes [Fri, 29 Apr 2016 18:05:28 +0000 (18:05 +0000)]
Merge "Fix <wctype.h>."
Elliott Hughes [Fri, 29 Apr 2016 15:24:19 +0000 (15:24 +0000)]
Merge "Remove declaration of pthread_cond_timeout_np." am:
adc8d34137 am:
45588044be
am:
124f8a64db
* commit '
124f8a64db806a221caeb33c016289cfcdb3dfee':
Remove declaration of pthread_cond_timeout_np.
Change-Id: Ie4410cf479af165e4bad9aade0a1c7820614e6ef
Elliott Hughes [Fri, 29 Apr 2016 15:22:21 +0000 (15:22 +0000)]
Merge "Remove declaration of pthread_cond_timeout_np." am:
adc8d34137
am:
45588044be
* commit '
45588044be26939024317f164ff53098ff2bd553':
Remove declaration of pthread_cond_timeout_np.
Change-Id: I6377985e80f6a36e0c2b94fd2275b5a8ce33c794
Elliott Hughes [Fri, 29 Apr 2016 15:19:30 +0000 (15:19 +0000)]
Merge "Remove declaration of pthread_cond_timeout_np."
am:
adc8d34137
* commit '
adc8d34137848e78e50a46724a3f8858c17eaf49':
Remove declaration of pthread_cond_timeout_np.
Change-Id: Ic162efaf980dc9d09261bbb586201bd994fc755f
Elliott Hughes [Fri, 29 Apr 2016 15:11:59 +0000 (15:11 +0000)]
Merge "Remove declaration of pthread_cond_timeout_np."
Neil Fuller [Fri, 29 Apr 2016 09:36:29 +0000 (09:36 +0000)]
Merge "Update timezone data to 2016d" am:
216c3007ed am:
fdedef9d98
am:
aecf68513a
* commit '
aecf68513a0588e42c09367630243af6e6928ab2':
Update timezone data to 2016d
Change-Id: Ifad0c823f17aada50b05a7c314bd6f22dc9c141b
Neil Fuller [Fri, 29 Apr 2016 09:36:29 +0000 (09:36 +0000)]
Merge "Update timezone data to 2016c" am:
418bdafb82 am:
09951a85f0 -s ours
am:
b0cd3dd641
* commit '
b0cd3dd641f67fa0fb72312025cf0bf35ab5c550':
Update timezone data to 2016c
Change-Id: Iff4c28aa54c1db6c49c334103c3d514c07796dd5
Neil Fuller [Fri, 29 Apr 2016 09:34:01 +0000 (09:34 +0000)]
Merge "Update timezone data to 2016d" am:
216c3007ed
am:
fdedef9d98
* commit '
fdedef9d989db958c838b4f5fda36b5504cb343b':
Update timezone data to 2016d
Change-Id: I911f6b7eebfd4a06392aacbb5553a5e1f865c53e
Neil Fuller [Fri, 29 Apr 2016 09:33:18 +0000 (09:33 +0000)]
Merge "Update timezone data to 2016b" am:
f1b38527ea am:
207b870a8a -s ours
am:
5ea55c7f70
* commit '
5ea55c7f70a3767c3bc613b715b8153ec2ec7388':
Update timezone data to 2016b
Change-Id: I6228bb401490c2a95852a45aa819c4a6649bc5c8
Neil Fuller [Fri, 29 Apr 2016 09:33:18 +0000 (09:33 +0000)]
Merge "Update timezone data to 2016c" am:
418bdafb82
am:
09951a85f0 -s ours
* commit '
09951a85f0d345ea733806e5aca4436758bd7bad':
Update timezone data to 2016c
Change-Id: I8fcb5f07c964db121e731005cc0ce8a9b82236e3
Neil Fuller [Fri, 29 Apr 2016 09:30:56 +0000 (09:30 +0000)]
Merge "Update timezone data to 2016b" am:
f1b38527ea
am:
207b870a8a -s ours
* commit '
207b870a8a0e29f9700d4ded7375b71d3495af31':
Update timezone data to 2016b
Change-Id: I01ce52414eeb4bf2c3bcef21d97bd39b10377a5b
Neil Fuller [Fri, 29 Apr 2016 09:21:20 +0000 (09:21 +0000)]
Merge "Update timezone data to 2016d"
am:
216c3007ed
* commit '
216c3007ed6100f42e6c97bdaf0086f61320773b':
Update timezone data to 2016d
Change-Id: I3c40e24b9ea5052fae92a72a8c7188c74a4f8bdc
OSDN Git Service
