OSDN Git Service
Dan Albert [Wed, 3 Aug 2016 17:56:39 +0000 (17:56 +0000)]
Merge changes Iecc1b127,Ib67f07db,I7672d34c
am:
f0b53115ae
Change-Id: If0a88b7f14808a5339858e276df822f9683929a9
Treehugger Robot [Wed, 3 Aug 2016 17:50:37 +0000 (17:50 +0000)]
Merge changes Iecc1b127,Ib67f07db,I7672d34c
* changes:
Run genversion-scripts.py.
Only check arch tag if we have *any* arch tags.
Add pylintrc.
Josh Gao [Wed, 3 Aug 2016 00:29:56 +0000 (00:29 +0000)]
Merge changes Ib5962ea3,I8c1a7464,I06ce7c31
am:
d7d4937bdc
Change-Id: I96334b89823b75a6d7c56e94f665aab16daed1a9
Treehugger Robot [Wed, 3 Aug 2016 00:22:11 +0000 (00:22 +0000)]
Merge changes Ib5962ea3,I8c1a7464,I06ce7c31
* changes:
Add version information for legacy inlines.
versioner: remove unnecessary kernel/common symlink.
versioner: add symlink for kernel/android/uapi.
Dan Albert [Tue, 2 Aug 2016 22:20:36 +0000 (15:20 -0700)]
Run genversion-scripts.py.
Change-Id: Iecc1b127c67a96aecc4e86582c1cc3291a4acf00
Dan Albert [Tue, 2 Aug 2016 22:19:26 +0000 (15:19 -0700)]
Only check arch tag if we have *any* arch tags.
With the introduction of new tags for ndk_library, we'll have a lot
of tags that aren't architecture tags. If we have something tagged
`introduced=21`, it should be in all architectures.
Change-Id: Ib67f07db14625f6903919c181050316eb183bed5
Dan Albert [Tue, 2 Aug 2016 22:15:09 +0000 (15:15 -0700)]
Add pylintrc.
Disable all the style differences present in genversion-scripts.py.
Change-Id: I7672d34c4f7698ba445968dd5d9f5ef1fdc60056
Dan Albert [Tue, 2 Aug 2016 21:56:17 +0000 (21:56 +0000)]
Merge changes Iedab3259,I333fe8ae
am:
0fb3b0aec4
Change-Id: I4eeb1ce1eb8b8b8bbefa38ab339a649fa2e793e4
Treehugger Robot [Tue, 2 Aug 2016 21:44:20 +0000 (21:44 +0000)]
Merge changes Iedab3259,I333fe8ae
* changes:
Put bsd_signal back.
Unversion some symbols for the NDK.
Josh Gao [Tue, 26 Jul 2016 23:34:40 +0000 (16:34 -0700)]
Add version information for legacy inlines.
Bug: http://b/
30170081
Change-Id: Ib5962ea3037dd692a98b6691d263871549aac8af
Josh Gao [Wed, 27 Jul 2016 23:29:31 +0000 (16:29 -0700)]
versioner: remove unnecessary kernel/common symlink.
The target was moved by commit
5956b4e, but none of the headers
contained were actually necessary to compile any bionic headers.
Bug: http://b/
30170081
Change-Id: I8c1a7464de0992c20af194340c0e36d131a836e7
Josh Gao [Tue, 26 Jul 2016 21:04:01 +0000 (14:04 -0700)]
versioner: add symlink for kernel/android/uapi.
The android-only kernel headers were moved to their own directory by
commit
d6e8b8c. Add a new symlink to match.
Change-Id: I06ce7c3167fbb1e058e4a137fae9375bb5792a46
Dimitry Ivanov [Tue, 2 Aug 2016 18:24:04 +0000 (18:24 +0000)]
Merge "Correct libstdc++ version"
am:
bbf593f0f0
Change-Id: I9f549b8548ac8a2b9d0014bcf4b7e2887437ecd5
Dimitry Ivanov [Tue, 2 Aug 2016 18:17:08 +0000 (18:17 +0000)]
Merge "Correct libstdc++ version"
Dan Albert [Sat, 30 Jul 2016 00:45:21 +0000 (17:45 -0700)]
Put bsd_signal back.
With this change (and all the others below it in the stack), the only
difference between the arm android-9 libc.so in r13-beta1 and the one
we are now generating is the addition of LIBC_N and LIBC_O versions.
Test: make ndk, readelf stub libc.so to check symbol exists
Bug: https://github.com/android-ndk/ndk/issues/160
Change-Id: Iedab32592b2d979f3cc922ffd4ed406427de3dda
Dan Albert [Sat, 30 Jul 2016 00:37:08 +0000 (17:37 -0700)]
Unversion some symbols for the NDK.
These functions were erroneously released in LIBC_PRIVATE for M, but
in fact need to be public. Since we need to be able to load them on M
even if they were built for a lower platform (and M needs to load on
newer platforms), we need to unversion them.
Change-Id: I333fe8ae7380cc2a5dbd699414399ec52f602383
Elliott Hughes [Tue, 2 Aug 2016 02:39:41 +0000 (02:39 +0000)]
Merge "More stdio one-liners."
am:
1d8b312a07
Change-Id: I7eed8712ed987a162bd745b181ad700a0ccb490e
Treehugger Robot [Tue, 2 Aug 2016 02:30:14 +0000 (02:30 +0000)]
Merge "More stdio one-liners."
Elliott Hughes [Mon, 1 Aug 2016 23:35:17 +0000 (16:35 -0700)]
More stdio one-liners.
This actually turns up a bug in fmemopen, so I guess that's what I'll
look at next...
Change-Id: I2971ecd1b5a3a3c7f43c22d985f88e389af89e97
Elliott Hughes [Mon, 1 Aug 2016 23:35:01 +0000 (23:35 +0000)]
Merge changes I2d334db2,Iab9fbc73
am:
5b1357da65
Change-Id: I485d46044040615d669ba0e61c4b7547cfcfbbb1
Treehugger Robot [Mon, 1 Aug 2016 23:25:59 +0000 (23:25 +0000)]
Merge changes I2d334db2,Iab9fbc73
* changes:
Clean up 32-bit x86 memset assembler.
Fix x86 __memset_chk.
Dimitry Ivanov [Mon, 1 Aug 2016 22:45:42 +0000 (15:45 -0700)]
Correct libstdc++ version
The version script is introduced in O
Bug: http://b/
28987948
Change-Id: Icd0a27d1b67e8227e44aa6e771816f0e6ed489b8
Elliott Hughes [Mon, 1 Aug 2016 21:39:59 +0000 (21:39 +0000)]
Merge "Update testing docs."
am:
0133e32ed5
Change-Id: If893eabc6467d0081e6bd732f4183bc9b3773cd6
Treehugger Robot [Mon, 1 Aug 2016 21:33:25 +0000 (21:33 +0000)]
Merge "Update testing docs."
Dimitry Ivanov [Mon, 1 Aug 2016 21:11:39 +0000 (21:11 +0000)]
Merge "Sync linker with internal branch"
am:
a86e11f529
Change-Id: I658fa5cb660ca60423e171d01bed2a4f9d9139ca
Dimitry Ivanov [Mon, 1 Aug 2016 21:01:28 +0000 (21:01 +0000)]
Merge "Sync linker with internal branch"
Elliott Hughes [Mon, 1 Aug 2016 21:00:45 +0000 (14:00 -0700)]
Clean up 32-bit x86 memset assembler.
Change-Id: I2d334db29226f9c60cf20220a569f1b772bf7c66
Elliott Hughes [Mon, 1 Aug 2016 20:16:37 +0000 (13:16 -0700)]
Update testing docs.
Change-Id: Ic0e1c3105d1cf8e73c0fbfd51052895beed76227
Elliott Hughes [Mon, 1 Aug 2016 20:13:09 +0000 (20:13 +0000)]
Merge \"More stdio cleanup.\"
am:
490b9515e7
Change-Id: Ia6092bea6c07b14b2dd2abb67975df57abbc4aa2
Treehugger Robot [Mon, 1 Aug 2016 20:05:43 +0000 (20:05 +0000)]
Merge "More stdio cleanup."
Dimitry Ivanov [Thu, 21 Jul 2016 18:33:40 +0000 (11:33 -0700)]
Sync linker with internal branch
This change includes dlwarning implementation and
the compatibility greylist for apps targeting pre-N.
Change-Id: Ibf02a07cc58cbbb1a5aef4ac34558c5d43e4305f
Test: Run bionic-unit-tests --gtest_filter=dl*:Dl*
Elliott Hughes [Mon, 1 Aug 2016 17:32:33 +0000 (17:32 +0000)]
Merge \"Restore attribute alloc_size for GCC.\"
am:
c5e79567e0
Change-Id: I8638e1da559e14367a1f305dffbc5b4296a5a047
Treehugger Robot [Mon, 1 Aug 2016 17:27:36 +0000 (17:27 +0000)]
Merge "Restore attribute alloc_size for GCC."
Lev Rumyantsev [Sat, 30 Jul 2016 00:55:42 +0000 (17:55 -0700)]
Fix x86 __memset_chk.
When __memset_chk_fail moved to C++, we didn't take into account
that the stack wasn't set up correctly for the jump from assembler.
Presumably no one had run the 32-bit x86 tests until now!
Bug: http://b/
30513094
Change-Id: Iab9fbc731b6bfecd7ca4d3f3844d0568a5d30d86
Elliott Hughes [Sat, 30 Jul 2016 16:58:15 +0000 (09:58 -0700)]
Restore attribute alloc_size for GCC.
clang doesn't support attribute alloc_size, but GCC uses it to give
diagnostics where clang can't, and we had a test for one such case.
Bug: http://b/
30513330
Change-Id: I4c14771258992d6bea684db7f91d60312642662f
Dan Albert [Sat, 30 Jul 2016 05:13:26 +0000 (05:13 +0000)]
Merge changes I946cde38,I4b8e0ea1,I2e8141a8
am:
3318c56c99
Change-Id: I3a6e296f77964f0505bb5ef116ee9798338029b9
Dimitry Ivanov [Sat, 30 Jul 2016 05:13:24 +0000 (05:13 +0000)]
Merge \"Improvements to initialization of linker_allocator\"
am:
9a776af992
Change-Id: Ia85abbd8bc07e600fc32c2b7a639ad3135177db4
Elliott Hughes [Sat, 30 Jul 2016 05:13:21 +0000 (05:13 +0000)]
Merge \"Upgrade to tzcode-2016f.\"
am:
def5854676
Change-Id: Ic98f4e6e27bf7b9388480aba25ebed085a0c8827
Treehugger Robot [Sat, 30 Jul 2016 02:07:16 +0000 (02:07 +0000)]
Merge changes I946cde38,I4b8e0ea1,I2e8141a8
* changes:
Mark LIBC_O as being a future version.
Mark LIBC_N as being introduced in android-24.
Annotate the libc version map with NDK info.
Dan Albert [Fri, 29 Jul 2016 00:41:57 +0000 (17:41 -0700)]
Mark LIBC_O as being a future version.
None of these symbols are in the NDK yet. Skip them.
Change-Id: I946cde38e767190c396593d562babc90457973fb
Dan Albert [Fri, 29 Jul 2016 01:08:42 +0000 (18:08 -0700)]
Mark LIBC_N as being introduced in android-24.
Change-Id: I4b8e0ea1fc9b42c1f98f36ae7aaaae2c6322e16b
Dan Albert [Thu, 28 Jul 2016 06:56:54 +0000 (23:56 -0700)]
Annotate the libc version map with NDK info.
Generated by running
https://android-review.googlesource.com/#/c/251477/ for libc.
Test: make checkbuild with
https://android-review.googlesource.com/#/q/branch:master+topic:ndk_library-libc-libm
Change-Id: I2e8141a83c1d79fd89b5e5c4432400b8301ba347
Elliott Hughes [Fri, 29 Jul 2016 23:31:52 +0000 (16:31 -0700)]
More stdio cleanup.
Time to get back to cleaning up stdio, so start with a bunch of easy
one-liners...
Change-Id: I8df5fdc72500a89b977bfaa6c64c3639198d4e3e
Treehugger Robot [Fri, 29 Jul 2016 22:20:50 +0000 (22:20 +0000)]
Merge "Improvements to initialization of linker_allocator"
Treehugger Robot [Fri, 29 Jul 2016 22:13:56 +0000 (22:13 +0000)]
Merge "Upgrade to tzcode-2016f."
Dimitry Ivanov [Fri, 29 Jul 2016 20:25:33 +0000 (13:25 -0700)]
Improvements to initialization of linker_allocator
Make linker_allocator independent of the order of global constructors.
Bug: http://b/
30483811
Change-Id: I18a323175661b8e1c9e398f2d6112f7a08d2cceb
Test: boot the device with I3ac91758a1a043146c65f2ae0f36fcfbe372c30f
Elliott Hughes [Fri, 29 Jul 2016 21:04:17 +0000 (14:04 -0700)]
Upgrade to tzcode-2016f.
No significant changes other than a default implementation of strftime_l.
Change-Id: I6edd2c03e5e7559f012c0c87d43f7109d641d3ca
Dimitry Ivanov [Thu, 28 Jul 2016 22:57:01 +0000 (22:57 +0000)]
Merge \"Add symbol versions to libstdc++.so\"
am:
4bc6eea83e
Change-Id: Ibe6325470a1c6ec96dbfe9d75273206069a8f459
Dimitry Ivanov [Thu, 28 Jul 2016 22:38:08 +0000 (22:38 +0000)]
Merge "Add symbol versions to libstdc++.so"
Dimitry Ivanov [Thu, 28 Jul 2016 20:52:17 +0000 (13:52 -0700)]
Add symbol versions to libstdc++.so
Bug: http://b/
28987948
Change-Id: I3853528bd432ceab37e4867f2c4112d9ee0b40dc
Elliott Hughes [Thu, 28 Jul 2016 00:46:06 +0000 (00:46 +0000)]
Merge \"Add IOV_MAX to <limits.h>.\"
am:
0cf1abe486
Change-Id: Ic830c385c4bbbefa29162a83e5fcad6234d344c6
Treehugger Robot [Thu, 28 Jul 2016 00:20:36 +0000 (00:20 +0000)]
Merge "Add IOV_MAX to <limits.h>."
Elliott Hughes [Wed, 27 Jul 2016 23:20:27 +0000 (23:20 +0000)]
Merge \"Admit that we don\'t actually support thread priority inheritance.\"
am:
c7d97ec31d
Change-Id: I700257f4851dbdca8972f2d5864cdc6a74bbed43
Treehugger Robot [Wed, 27 Jul 2016 22:33:52 +0000 (22:33 +0000)]
Merge "Admit that we don't actually support thread priority inheritance."
Elliott Hughes [Wed, 27 Jul 2016 22:24:47 +0000 (15:24 -0700)]
Add IOV_MAX to <limits.h>.
strace 4.13 assumes we have IOV_MAX. POSIX says it lives here. 1024 is
a Linux kernel limitation.
Change-Id: Icb428172670e4936a459db38a6a190b7178fe9f3
Elliott Hughes [Wed, 27 Jul 2016 21:05:10 +0000 (14:05 -0700)]
Admit that we don't actually support thread priority inheritance.
Bug: https://code.google.com/p/android/issues/detail?id=218323
Change-Id: I6c69b0fbb8414e7cc2deeb8be50b6af4830ed55e
Elliott Hughes [Wed, 27 Jul 2016 18:55:57 +0000 (18:55 +0000)]
Merge \"Clean up <uchar.h> and <wctype.h> transitive includes.\"
am:
931be5a64d
Change-Id: I62223ec83e67b986ef2f57647d298ce18db19a51
Treehugger Robot [Wed, 27 Jul 2016 18:44:07 +0000 (18:44 +0000)]
Merge "Clean up <uchar.h> and <wctype.h> transitive includes."
Christopher Ferris [Wed, 27 Jul 2016 18:03:30 +0000 (18:03 +0000)]
Merge \"More kernel header cleanup.\"
am:
af8be4ebbc
Change-Id: Ie47ac6933cfb0dd936571455441f737547631182
Christopher Ferris [Wed, 27 Jul 2016 17:56:55 +0000 (17:56 +0000)]
Merge "More kernel header cleanup."
Elliott Hughes [Wed, 27 Jul 2016 17:45:05 +0000 (10:45 -0700)]
Clean up <uchar.h> and <wctype.h> transitive includes.
Bug: http://b/
30367366
Change-Id: I63212a34c54ca07223a15aa5be4da3bdc6aa38a8
Dan Albert [Wed, 27 Jul 2016 01:29:10 +0000 (01:29 +0000)]
Merge changes I0262eed9,Iba9ee03a
am:
61bd7cb6e9
Change-Id: I670bc197b4465ae1aa01d18821db77a586991ebf
Treehugger Robot [Wed, 27 Jul 2016 00:30:30 +0000 (00:30 +0000)]
Merge changes I0262eed9,Iba9ee03a
* changes:
Add a temporary hack to work around __NDK_FPABI__.
Remove _GNU_SOURCE guard on tmpnam.
Dan Albert [Tue, 26 Jul 2016 23:27:31 +0000 (16:27 -0700)]
Add a temporary hack to work around __NDK_FPABI__.
Test: make checkbuild
Bug: http://b/
27533932
Change-Id: I0262eed91b10b0dd5fe27a61fb8f35b3c062280e
Dan Albert [Tue, 26 Jul 2016 23:26:15 +0000 (16:26 -0700)]
Remove _GNU_SOURCE guard on tmpnam.
This shouldn't be guarded by _GNU_SOURCE. external/opencv3 expects
P_tmpdir to be available.
http://pubs.opengroup.org/onlinepubs/
009695399/functions/tmpnam.html
Test: make checkbuild
Change-Id: Iba9ee03aec6e712356b571f7165ed1809e6227fe
Elliott Hughes [Mon, 25 Jul 2016 23:56:42 +0000 (23:56 +0000)]
Merge \"Remove #pragma GCC visibility.\"
am:
9f326a2d60
Change-Id: I7c19f2012cd851ca6eec04c23e2ecd62b591933d
Treehugger Robot [Mon, 25 Jul 2016 23:48:07 +0000 (23:48 +0000)]
Merge "Remove #pragma GCC visibility."
Elliott Hughes [Mon, 25 Jul 2016 22:57:02 +0000 (15:57 -0700)]
Remove #pragma GCC visibility.
We have better control over visibility now.
Bug: http://b/
24767418
Change-Id: Ifa9a1e5af4bd4217db08422050908770247b3b69
Elliott Hughes [Mon, 25 Jul 2016 22:39:38 +0000 (22:39 +0000)]
Merge \"Stop #define\'ing __func__ and __restrict.\"
am:
e656a3acaf
Change-Id: Ifa5e16df33f88ed929652f1b902d348012b62048
Elliott Hughes [Mon, 25 Jul 2016 22:32:56 +0000 (22:32 +0000)]
Merge "Stop #define'ing __func__ and __restrict."
Elliott Hughes [Mon, 25 Jul 2016 16:20:57 +0000 (09:20 -0700)]
Stop #define'ing __func__ and __restrict.
__STDC_VERSION__ isn't defined for __cplusplus, so we've been removing
such checks. Some got missed.
Stop defining __func__ and just use the __PRETTY_FUNCTION__ GCC extension
in <assert.h>. Also fix the #if there so that C++ gets __assert2 rather
than __assert, and rewrite the cast to work with -I rather than -isystem.
Also remove __restrict and just always use the __restrict GCC extension.
Add a trivial test for <assert.h>.
Bug: http://b/
30353757
Change-Id: Ie49bb417976293d3a9692b516e28fe3c0ae0a6d9
Test: ran bionic unit tests.
Elliott Hughes [Sat, 23 Jul 2016 03:53:39 +0000 (03:53 +0000)]
Merge \"Remove bionic\'s now-unused UniquePtr.\"
am:
557b3a1194
Change-Id: Iee6aaa142772b2947a124393b1ad42d20716dd35
Elliott Hughes [Sat, 23 Jul 2016 03:53:38 +0000 (03:53 +0000)]
Merge \"Remove unnecessary \'extern\'s.\"
am:
0cdd0d4e63
Change-Id: I1874cc11cec65d5bdac80d4f3770c18628735635
Treehugger Robot [Sat, 23 Jul 2016 03:51:19 +0000 (03:51 +0000)]
Merge "Remove bionic's now-unused UniquePtr."
Treehugger Robot [Sat, 23 Jul 2016 03:47:18 +0000 (03:47 +0000)]
Merge "Remove unnecessary 'extern's."
Elliott Hughes [Sat, 23 Jul 2016 02:52:46 +0000 (19:52 -0700)]
Remove bionic's now-unused UniquePtr.
Change-Id: Id77dbdd6d4255ae8317449725ef093be9422407f
Elliott Hughes [Sat, 23 Jul 2016 01:57:12 +0000 (18:57 -0700)]
Remove unnecessary 'extern's.
Change-Id: Iba2b3fb6ff88e504f1657b915120ae43d58a1e03
Elliott Hughes [Sat, 23 Jul 2016 01:54:32 +0000 (01:54 +0000)]
Merge \"Always include <sys/cdefs.h>.\"
am:
7101c48f20
Change-Id: I940ae0c46898a5ce1d51bbe14fc8366dbed593b5
Treehugger Robot [Sat, 23 Jul 2016 01:48:21 +0000 (01:48 +0000)]
Merge "Always include <sys/cdefs.h>."
Josh Gao [Sat, 23 Jul 2016 00:08:54 +0000 (00:08 +0000)]
Merge \"Remove __BIONIC_LEGACY_INLINE.\"
am:
767e8147d7
Change-Id: I510e31c8820dffc6a212dd6f390b5eac8eea84c4
Elliott Hughes [Fri, 22 Jul 2016 21:56:18 +0000 (14:56 -0700)]
Always include <sys/cdefs.h>.
I made a mistake caught by code review earlier, so let's try to be
safer by default.
This patch also moves all our "forwarding" headers to the guardless
just-include-the-other-thing style that we usually use. (Where we
have a comment explaining where the header comes from, I've kept
that.)
Change-Id: I37342cf5e2563c6a269b2ba61a697069b1c7913b
Elliott Hughes [Sat, 23 Jul 2016 00:01:08 +0000 (00:01 +0000)]
Merge "Remove __BIONIC_LEGACY_INLINE."
Josh Gao [Fri, 22 Jul 2016 22:26:36 +0000 (15:26 -0700)]
Remove __BIONIC_LEGACY_INLINE.
Don't use the same declaration to declare both static and non-static
functions, to make life easier for versioner.
(Also, remove __BIONIC_LEGACY_INLINE from two functions in termios.h
that weren't actually legacy inlines.)
Bug: http://b/
30170081
Change-Id: Ibb73377d77a2b4cee016289b7c46a01452e45fae
Dimitry Ivanov [Fri, 22 Jul 2016 22:50:50 +0000 (22:50 +0000)]
Merge \"Add sanity checks for e_shentsize and e_shstrndx\"
am:
12ba7e51d9
Change-Id: I1bcc3a222f595798dd8b0c8bc96ea0c3ff107449
Dimitry Ivanov [Fri, 22 Jul 2016 22:44:53 +0000 (22:44 +0000)]
Merge "Add sanity checks for e_shentsize and e_shstrndx"
Elliott Hughes [Fri, 22 Jul 2016 21:47:47 +0000 (21:47 +0000)]
Merge \"Make it possible to build bionic with -I instead of -isystem.\"
am:
420d02c56d
Change-Id: I2b105c0dbe34e206fbdb6a1ad5df82f17564ec2a
Elliott Hughes [Fri, 22 Jul 2016 21:35:02 +0000 (21:35 +0000)]
Merge "Make it possible to build bionic with -I instead of -isystem."
Elliott Hughes [Fri, 22 Jul 2016 18:36:17 +0000 (11:36 -0700)]
Make it possible to build bionic with -I instead of -isystem.
Various things:
* work around -Wnullability-completeness.
* use C++ casts in C++ and C casts in C.
* stop using attributes clang doesn't support (such as `warning`).
* remove duplicate definitions of XATTR_CREATE and XATTR_REPLACE.
Change-Id: I07649e46275b28a23ca477deea119fe843999533
Dimitry Ivanov [Fri, 22 Jul 2016 19:50:59 +0000 (12:50 -0700)]
Add sanity checks for e_shentsize and e_shstrndx
This helps us avoid situations when malformed elf-files
are mistakenly loaded, - which might result in unexpected
behavior.
Bug: http://b/
30166532
Test: bionic-unit-tests --gtest_filter=dl*:Dl*
Change-Id: Idd6b4fa20e1d69a9f8d8391ba69c724d930fee51
Josh Gao [Fri, 22 Jul 2016 19:28:38 +0000 (19:28 +0000)]
Merge changes I7718b1ba,I648adc35
am:
4f62c5b311
Change-Id: Ia117c90c75866c0672cbdc0f0fa34975e58b2b0f
Christopher Ferris [Wed, 20 Jul 2016 19:28:56 +0000 (12:28 -0700)]
More kernel header cleanup.
Modify the generate script to add a new option and copy the types.h
arm header file since it's not currently being created properly. Also
manually generate the arm types.h uapi header since it's not being
properly generated right now.
Modify both generate scripts to delete the target directories before
adding the files to handle moved/deleted header files.
Move the common/scsi headers into android and delete the common
directory. Change the scripts to reflect this change.
Update the scsi headers since they've been modified in upstream kernels.
Bug:
30072483
Change-Id: Ia43d4b238b6a041350d60cc30184ecbd4829d7d5
Treehugger Robot [Fri, 22 Jul 2016 19:20:58 +0000 (19:20 +0000)]
Merge changes I7718b1ba,I648adc35
* changes:
Only initialize the global stack protector once.
Make getpid work before TLS has been initialized.
Elliott Hughes [Fri, 22 Jul 2016 00:39:14 +0000 (00:39 +0000)]
Merge \"Only define sa_family_t once.\"
am:
237366867a
Change-Id: Ifef06cfc6a9ee7d5d681f9886408d4c436a6fe32
Treehugger Robot [Fri, 22 Jul 2016 00:28:18 +0000 (00:28 +0000)]
Merge "Only define sa_family_t once."
Elliott Hughes [Thu, 21 Jul 2016 23:38:43 +0000 (16:38 -0700)]
Only define sa_family_t once.
Change-Id: Icf700910c836d22c8a27ad026ec8af11697edd5a
Elliott Hughes [Thu, 21 Jul 2016 08:14:31 +0000 (08:14 +0000)]
Merge \"Treat \"persist.sys.timezone\" as being a Java-format timezone.\"
am:
91f33cd5ae
Change-Id: Iafd50c6b6b44166f2fdf1506dbcbe5c788568966
Treehugger Robot [Thu, 21 Jul 2016 08:06:33 +0000 (08:06 +0000)]
Merge "Treat "persist.sys.timezone" as being a Java-format timezone."
Christopher Ferris [Thu, 21 Jul 2016 01:19:06 +0000 (18:19 -0700)]
resolve merge conflicts of
823e32e to stage-aosp-master
Change-Id: I93911e76d85f55d9105c1349cd919dc924fbd5e4
Elliott Hughes [Thu, 21 Jul 2016 00:23:54 +0000 (17:23 -0700)]
Treat "persist.sys.timezone" as being a Java-format timezone.
POSIX and Java disagree about the sign in a timezone string like "GMT+3".
This means that if you set "persist.sys.timezone" to such a string, native
code and Java code disagree about what time it is. Resolve this by
translating to POSIX form for native code.
Bug: http://b/
25463955
Change-Id: I7c08c459dd8514348a12ce419edcbfbfe8f6d327
Test: manually tested with setprop and date.
Dimitry Ivanov [Thu, 21 Jul 2016 00:08:46 +0000 (00:08 +0000)]
Merge "Pass argc/argv/envp to dso constructors"