OSDN Git Service

android-x86/bionic.git
7 years agoMerge \\"Stop #define\\'ing __func__ and __restrict.\\" am: e656a3acaf
Elliott Hughes [Mon, 25 Jul 2016 22:42:05 +0000 (22:42 +0000)]
Merge \\"Stop #define\\'ing __func__ and __restrict.\\" am: e656a3acaf
am: 28250109c2

Change-Id: I8f976dfd3fe9cf76a753394412e5856c1111d4ac

7 years agoMerge \"Stop #define\'ing __func__ and __restrict.\"
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

7 years agoMerge "Stop #define'ing __func__ and __restrict."
Elliott Hughes [Mon, 25 Jul 2016 22:32:56 +0000 (22:32 +0000)]
Merge "Stop #define'ing __func__ and __restrict."

7 years agoStop #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.

8 years agoMerge \\"Remove bionic\\'s now-unused UniquePtr.\\" am: 557b3a1194
Elliott Hughes [Sat, 23 Jul 2016 03:56:37 +0000 (03:56 +0000)]
Merge \\"Remove bionic\\'s now-unused UniquePtr.\\" am: 557b3a1194
am: 6c7b1953fb

Change-Id: I684feeb8f74f1ba02c2ddb01e4aa889b967d3f4f

8 years agoMerge \\"Remove unnecessary \\'extern\\'s.\\" am: 0cdd0d4e63
Elliott Hughes [Sat, 23 Jul 2016 03:56:36 +0000 (03:56 +0000)]
Merge \\"Remove unnecessary \\'extern\\'s.\\" am: 0cdd0d4e63
am: 62d679fcf6

Change-Id: I51860f017a59619ccd33d4cdea8e4e4dad4360f5

8 years agoMerge \"Remove bionic\'s now-unused UniquePtr.\"
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

8 years agoMerge \"Remove unnecessary \'extern\'s.\"
Elliott Hughes [Sat, 23 Jul 2016 03:53:38 +0000 (03:53 +0000)]
Merge \"Remove unnecessary \'extern\'s.\"
am: 0cdd0d4e63

Change-Id: I1874cc11cec65d5bdac80d4f3770c18628735635

8 years agoMerge "Remove bionic's now-unused UniquePtr."
Treehugger Robot [Sat, 23 Jul 2016 03:51:19 +0000 (03:51 +0000)]
Merge "Remove bionic's now-unused UniquePtr."

8 years agoMerge "Remove unnecessary 'extern's."
Treehugger Robot [Sat, 23 Jul 2016 03:47:18 +0000 (03:47 +0000)]
Merge "Remove unnecessary 'extern's."

8 years agoRemove bionic's now-unused UniquePtr.
Elliott Hughes [Sat, 23 Jul 2016 02:52:46 +0000 (19:52 -0700)]
Remove bionic's now-unused UniquePtr.

Change-Id: Id77dbdd6d4255ae8317449725ef093be9422407f

8 years agoMerge \\"Always include <sys/cdefs.h>.\\" am: 7101c48f20
Elliott Hughes [Sat, 23 Jul 2016 01:57:30 +0000 (01:57 +0000)]
Merge \\"Always include <sys/cdefs.h>.\\" am: 7101c48f20
am: c5e0991f91

Change-Id: I9c9ed60df0b3b81d7e7decf2b461d34ab81606e2

8 years agoRemove unnecessary 'extern's.
Elliott Hughes [Sat, 23 Jul 2016 01:57:12 +0000 (18:57 -0700)]
Remove unnecessary 'extern's.

Change-Id: Iba2b3fb6ff88e504f1657b915120ae43d58a1e03

8 years agoMerge \"Always include <sys/cdefs.h>.\"
Elliott Hughes [Sat, 23 Jul 2016 01:54:32 +0000 (01:54 +0000)]
Merge \"Always include <sys/cdefs.h>.\"
am: 7101c48f20

Change-Id: I940ae0c46898a5ce1d51bbe14fc8366dbed593b5

8 years agoMerge "Always include <sys/cdefs.h>."
Treehugger Robot [Sat, 23 Jul 2016 01:48:21 +0000 (01:48 +0000)]
Merge "Always include <sys/cdefs.h>."

8 years agoMerge \\"Remove __BIONIC_LEGACY_INLINE.\\" am: 767e8147d7
Elliott Hughes [Sat, 23 Jul 2016 00:11:23 +0000 (00:11 +0000)]
Merge \\"Remove __BIONIC_LEGACY_INLINE.\\" am: 767e8147d7
am: fc49e01100

Change-Id: If2a8058b12132fda1315bb038571595a7720a643

8 years agoMerge \"Remove __BIONIC_LEGACY_INLINE.\"
Josh Gao [Sat, 23 Jul 2016 00:08:54 +0000 (00:08 +0000)]
Merge \"Remove __BIONIC_LEGACY_INLINE.\"
am: 767e8147d7

Change-Id: I510e31c8820dffc6a212dd6f390b5eac8eea84c4

8 years agoAlways include <sys/cdefs.h>.
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

8 years agoMerge "Remove __BIONIC_LEGACY_INLINE."
Elliott Hughes [Sat, 23 Jul 2016 00:01:08 +0000 (00:01 +0000)]
Merge "Remove __BIONIC_LEGACY_INLINE."

8 years agoMerge \\"Add sanity checks for e_shentsize and e_shstrndx\\" am: 12ba7e51d9
Dimitry Ivanov [Fri, 22 Jul 2016 22:53:19 +0000 (22:53 +0000)]
Merge \\"Add sanity checks for e_shentsize and e_shstrndx\\" am: 12ba7e51d9
am: 75e48aaf7a

Change-Id: I21998979a4a741a6d073da9596c3c6541cd39520

8 years agoRemove __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

8 years agoMerge \"Add sanity checks for e_shentsize and e_shstrndx\"
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

8 years agoMerge "Add sanity checks for e_shentsize and e_shstrndx"
Dimitry Ivanov [Fri, 22 Jul 2016 22:44:53 +0000 (22:44 +0000)]
Merge "Add sanity checks for e_shentsize and e_shstrndx"

8 years agoMerge \\"Make it possible to build bionic with -I instead of -isystem.\\" am: 420d02c56d
Elliott Hughes [Fri, 22 Jul 2016 21:50:14 +0000 (21:50 +0000)]
Merge \\"Make it possible to build bionic with -I instead of -isystem.\\" am: 420d02c56d
am: 1665158b71

Change-Id: Ie41e4fd68dadcd08056e5e14295833c6d824612a

8 years agoMerge \"Make it possible to build bionic with -I instead of -isystem.\"
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

8 years agoMerge "Make it possible to build bionic with -I instead of -isystem."
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."

8 years agoMake 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

8 years agoAdd sanity checks for e_shentsize and e_shstrndx
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

8 years agoMerge changes I7718b1ba,I648adc35 am: 4f62c5b311
Josh Gao [Fri, 22 Jul 2016 19:31:06 +0000 (19:31 +0000)]
Merge changes I7718b1ba,I648adc35 am: 4f62c5b311
am: ba03502f56

Change-Id: I6f3589befd901b4b7485f0e682e0bb9b26b44190

8 years agoMerge changes I7718b1ba,I648adc35
Josh Gao [Fri, 22 Jul 2016 19:28:38 +0000 (19:28 +0000)]
Merge changes I7718b1ba,I648adc35
am: 4f62c5b311

Change-Id: Ia117c90c75866c0672cbdc0f0fa34975e58b2b0f

8 years agoMerge changes I7718b1ba,I648adc35
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.

8 years agoMerge \\"Only define sa_family_t once.\\" am: 237366867a
Elliott Hughes [Fri, 22 Jul 2016 00:41:43 +0000 (00:41 +0000)]
Merge \\"Only define sa_family_t once.\\" am: 237366867a
am: f3a094a4ea

Change-Id: Ifaf33d50facd007d14696d3f0efdc225e43a518e

8 years agoMerge \"Only define sa_family_t once.\"
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

8 years agoMerge "Only define sa_family_t once."
Treehugger Robot [Fri, 22 Jul 2016 00:28:18 +0000 (00:28 +0000)]
Merge "Only define sa_family_t once."

8 years agoOnly 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

8 years agoMerge \\"Treat \\"persist.sys.timezone\\" as being a Java-format timezone.\\" am...
Elliott Hughes [Thu, 21 Jul 2016 08:16:59 +0000 (08:16 +0000)]
Merge \\"Treat \\"persist.sys.timezone\\" as being a Java-format timezone.\\" am: 91f33cd5ae
am: e81e3d5523

Change-Id: I8a657509a13290d138cea660f3920f38adb42ccc

8 years agoMerge \"Treat \"persist.sys.timezone\" as being a Java-format timezone.\"
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

8 years agoMerge "Treat "persist.sys.timezone" as being a Java-format timezone."
Treehugger Robot [Thu, 21 Jul 2016 08:06:33 +0000 (08:06 +0000)]
Merge "Treat "persist.sys.timezone" as being a Java-format timezone."

8 years agoresolve merge conflicts of 823e32e to stage-aosp-master
Dimitry Ivanov [Thu, 21 Jul 2016 02:11:06 +0000 (02:11 +0000)]
resolve merge conflicts of 823e32e to stage-aosp-master
am: 1750ab4e21

Change-Id: I2abd8e1b0ea8a2ae0898b91f6d0cb87b885a47d9

8 years agoresolve merge conflicts of 823e32e to stage-aosp-master
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

8 years agoTreat "persist.sys.timezone" as being a Java-format timezone.
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.

8 years agoMerge "Pass argc/argv/envp to dso constructors"
Dimitry Ivanov [Thu, 21 Jul 2016 00:08:46 +0000 (00:08 +0000)]
Merge "Pass argc/argv/envp to dso constructors"

8 years agoPass argc/argv/envp to dso constructors
Dimitry Ivanov [Wed, 20 Jul 2016 22:33:07 +0000 (15:33 -0700)]
Pass argc/argv/envp to dso constructors

The glibc implementation of the loader passes argc/argv/envp
to all elf constructors. This change makes bionic linker
behave in the same way.

Bug: http://b/30145768
Change-Id: I1c65c42aa5305a5b133c64b5748205bbde869e0e
Test: run bionic-unit-tests --gtest_filter=dl*:Dl*

8 years agoMerge \\"Align-up and randomize shared libraries.\\" am: a9fbaee593
Evgenii Stepanov [Wed, 20 Jul 2016 20:40:24 +0000 (20:40 +0000)]
Merge \\"Align-up and randomize shared libraries.\\" am: a9fbaee593
am: 2f5ed30a7c

Change-Id: I6b3395fa332645f6ee8bf2a77ea5df99557e45c7

8 years agoMerge \"Align-up and randomize shared libraries.\"
Evgenii Stepanov [Wed, 20 Jul 2016 20:37:26 +0000 (20:37 +0000)]
Merge \"Align-up and randomize shared libraries.\"
am: a9fbaee593

Change-Id: I5cb0caea4db3a8cb3b0e1a4dd3a4bb2d5f5069d9

8 years agoMerge "Align-up and randomize shared libraries."
Evgenii Stepanov [Wed, 20 Jul 2016 20:31:41 +0000 (20:31 +0000)]
Merge "Align-up and randomize shared libraries."

8 years agoMerge \\"Move/remove android only kernel uapi headers.\\" am: fe280773ed
Christopher Ferris [Wed, 20 Jul 2016 18:17:34 +0000 (18:17 +0000)]
Merge \\"Move/remove android only kernel uapi headers.\\" am: fe280773ed
am: fa46052743

Change-Id: Ic2bd319337384638d9d25b462e367bd8756764c7

8 years agoMerge \"Move/remove android only kernel uapi headers.\"
Christopher Ferris [Wed, 20 Jul 2016 18:09:38 +0000 (18:09 +0000)]
Merge \"Move/remove android only kernel uapi headers.\"
am: fe280773ed

Change-Id: If9de2352e7522628aff751211753c11d4d453ca8

8 years agoMerge "Move/remove android only kernel uapi headers."
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Move/remove android only kernel uapi headers."

8 years agoAlign-up and randomize shared libraries.
Evgenii Stepanov [Fri, 15 Jul 2016 23:31:42 +0000 (16:31 -0700)]
Align-up and randomize shared libraries.

This change implements the following property:
  Any 2**N aligned memory region on size 2**N contains no more than one DSO.

The value N can be configured, with 16 or 18 looking like a good choice.
Additionally, DSOs are loaded at random page-aligned address inside these large
regions.

This change has dual purpose:
1. Larger values of N allow a lot more compact CFI shadow implementation.
   See change I14dfea630de468eb5620e7f55f92b1397ba06217.
   For example, CFI shadow for the system_server process has the following size (RSS, KB):
   152 for N = 12, 32 for N = 16, 16 for N = 18.
2. Extra randomization is good for security.

This change does not result in extra RAM usage, because everything is still page-aligned.
It does result in a bit more VM fragmentation because of the gaps between shared libraries.
As it turns out, this fragmentation is barely noticeable because the kernel creates new mapping
at the highest possible address, and we do enough small mappings to almost completely fill the
gaps (ex. in the Zygote the gaps are filled with .ttf file mappings and thread stacks).

I've measured VM fragmentation as the sum of all VM gaps (unmapped regions) that are larger
than 1MB according to /proc/$PID/maps. On aosp_angler-userdebug, the numbers are (in GB):

                |   N = 12  |  N = 18
system_server   |   521.9   |  521.1
zygote64        |   522.1   |  521.3
zygote32        |   2.55    |  2.55
mediaserver     |   4.00    |  4.00

Change-Id: Ia6df840dd409c82837efd1f263be420d9723c84a

8 years agoMerge \\"Expand the testing docs slightly.\\" am: d941f72e75
Elliott Hughes [Tue, 19 Jul 2016 22:03:17 +0000 (22:03 +0000)]
Merge \\"Expand the testing docs slightly.\\" am: d941f72e75
am: 9f9d4caf3c

Change-Id: Ibcefc8a9b95957583d8991cb7e6aec42561889db

8 years agoMerge \"Expand the testing docs slightly.\"
Elliott Hughes [Tue, 19 Jul 2016 22:00:46 +0000 (22:00 +0000)]
Merge \"Expand the testing docs slightly.\"
am: d941f72e75

Change-Id: I9ad64b2f4b1af867b422af7a558338d1224823aa

8 years agoMerge \\"Remove __LIBC_ABI_PUBLIC__.\\" am: 9af76f9b48
Elliott Hughes [Tue, 19 Jul 2016 22:00:45 +0000 (22:00 +0000)]
Merge \\"Remove __LIBC_ABI_PUBLIC__.\\" am: 9af76f9b48
am: 234c0f6bb6

Change-Id: I3cf9c2859c2a3e0c57bc24cf44a96a8ee22d8931

8 years agoMerge \"Remove __LIBC_ABI_PUBLIC__.\"
Elliott Hughes [Tue, 19 Jul 2016 21:58:19 +0000 (21:58 +0000)]
Merge \"Remove __LIBC_ABI_PUBLIC__.\"
am: 9af76f9b48

Change-Id: I8e2e7bf6a70f978619499a0e96e424c6bdb1cdf0

8 years agoMerge "Expand the testing docs slightly."
Treehugger Robot [Tue, 19 Jul 2016 21:57:27 +0000 (21:57 +0000)]
Merge "Expand the testing docs slightly."

8 years agoMerge "Remove __LIBC_ABI_PUBLIC__."
Treehugger Robot [Tue, 19 Jul 2016 21:48:25 +0000 (21:48 +0000)]
Merge "Remove __LIBC_ABI_PUBLIC__."

8 years agoExpand the testing docs slightly.
Elliott Hughes [Tue, 19 Jul 2016 21:09:10 +0000 (14:09 -0700)]
Expand the testing docs slightly.

Change-Id: I4b172eefd8f456a62b24520a9f04f500a1d6bc85

8 years agoRemove __LIBC_ABI_PUBLIC__.
Elliott Hughes [Tue, 19 Jul 2016 20:56:46 +0000 (13:56 -0700)]
Remove __LIBC_ABI_PUBLIC__.

We have much better control over visibility now, so we don't need to
pollute the headers with cruft.

Bug: http://b/24767418
Change-Id: I349f4c3bc30102477375ad9f80926e560c7c1d8b

8 years agoMove/remove android only kernel uapi headers.
Christopher Ferris [Mon, 18 Jul 2016 23:27:22 +0000 (16:27 -0700)]
Move/remove android only kernel uapi headers.

Move all of the uapi kernel headers that are only found in the android
kernel, and are still used by the tree into their own directory.

Delete all of these files that are not used.

Also, delete binder.h from the linux directory since it already exists
in the linux/android directory.

Bug: 30072483
Change-Id: I879f16e366f7670b8be3546b0a9cf9567fce6526

8 years agoMerge \\"Add a test for a known kernel bug.\\" am: 061cf180db
Elliott Hughes [Tue, 19 Jul 2016 18:13:26 +0000 (18:13 +0000)]
Merge \\"Add a test for a known kernel bug.\\" am: 061cf180db
am: a2487be0c7

Change-Id: I54a33582078f8da658986aff13d8dc2163aaa149

8 years agoMerge \"Add a test for a known kernel bug.\"
Elliott Hughes [Tue, 19 Jul 2016 18:10:58 +0000 (18:10 +0000)]
Merge \"Add a test for a known kernel bug.\"
am: 061cf180db

Change-Id: I31af9c357077b932157eef80f3c51c96750986ab

8 years agoMerge "Add a test for a known kernel bug."
Treehugger Robot [Tue, 19 Jul 2016 17:52:03 +0000 (17:52 +0000)]
Merge "Add a test for a known kernel bug."

8 years agoMerge \\"Don\\'t declare SYS_* constants for unavailable __NR_* constants.\\" am...
Elliott Hughes [Mon, 18 Jul 2016 20:52:19 +0000 (20:52 +0000)]
Merge \\"Don\\'t declare SYS_* constants for unavailable __NR_* constants.\\" am: 20de9ef5bd
am: 1b2b8362c9

Change-Id: I38820757a6a083f7010a1e94d053372d99401c8c

8 years agoMerge \"Don\'t declare SYS_* constants for unavailable __NR_* constants.\"
Elliott Hughes [Mon, 18 Jul 2016 20:48:52 +0000 (20:48 +0000)]
Merge \"Don\'t declare SYS_* constants for unavailable __NR_* constants.\"
am: 20de9ef5bd

Change-Id: Ib9e6ef7fc06df0ac42414870061da287a9692d09

8 years agoMerge "Don't declare SYS_* constants for unavailable __NR_* constants."
Treehugger Robot [Mon, 18 Jul 2016 20:39:10 +0000 (20:39 +0000)]
Merge "Don't declare SYS_* constants for unavailable __NR_* constants."

8 years agoDon't declare SYS_* constants for unavailable __NR_* constants.
Elliott Hughes [Fri, 15 Jul 2016 22:47:47 +0000 (15:47 -0700)]
Don't declare SYS_* constants for unavailable __NR_* constants.

Bug: https://code.google.com/p/android/issues/detail?id=215853
Change-Id: Iaaa3ce888deb8d032208bf636b7badaed6a72d30

8 years agoMerge \"resolve merge conflicts of cf85fd5 to stage-aosp-master\" into stage-aosp...
Colin Cross [Fri, 15 Jul 2016 23:53:39 +0000 (23:53 +0000)]
Merge \"resolve merge conflicts of cf85fd5 to stage-aosp-master\" into stage-aosp-master
am: 22d5ddcb95

Change-Id: Ibb4f21faff2701b6ebc1e47154a8880dc3084dae

8 years agoresolve merge conflicts of cf85fd5 to stage-aosp-master
Colin Cross [Fri, 15 Jul 2016 23:53:37 +0000 (23:53 +0000)]
resolve merge conflicts of cf85fd5 to stage-aosp-master
am: 476950d104

Change-Id: I9663cbb46481cc026728a0ada38b061a3260dba1

8 years agoMerge "resolve merge conflicts of cf85fd5 to stage-aosp-master" into stage-aosp-master
TreeHugger Robot [Fri, 15 Jul 2016 23:51:04 +0000 (23:51 +0000)]
Merge "resolve merge conflicts of cf85fd5 to stage-aosp-master" into stage-aosp-master

8 years agoresolve merge conflicts of cf85fd5 to stage-aosp-master
Dimitry Ivanov [Fri, 15 Jul 2016 23:49:14 +0000 (16:49 -0700)]
resolve merge conflicts of cf85fd5 to stage-aosp-master

Change-Id: Id73b6e03a224ce9a3e3838731be24a16692ef6e0

8 years agoresolve merge conflicts of cf85fd5 to stage-aosp-master
Colin Cross [Fri, 15 Jul 2016 22:49:51 +0000 (15:49 -0700)]
resolve merge conflicts of cf85fd5 to stage-aosp-master

Change-Id: I29bb554c9469109f999c6921e169625ad52cc515

8 years agoMerge "Convert linker from Android.mk to Android.bp"
Treehugger Robot [Fri, 15 Jul 2016 22:31:13 +0000 (22:31 +0000)]
Merge "Convert linker from Android.mk to Android.bp"

8 years agoMerge \\"Put the legacy stdio fds back for pre-M.\\" am: 098d8ef5b2
Dan Albert [Fri, 15 Jul 2016 21:50:58 +0000 (21:50 +0000)]
Merge \\"Put the legacy stdio fds back for pre-M.\\" am: 098d8ef5b2
am: 548d8e0374

Change-Id: I26ca792199009a338c95414783470d9e77afa2b2

8 years agoMerge \"Put the legacy stdio fds back for pre-M.\"
Dan Albert [Fri, 15 Jul 2016 21:48:30 +0000 (21:48 +0000)]
Merge \"Put the legacy stdio fds back for pre-M.\"
am: 098d8ef5b2

Change-Id: I32565181dcfc9caab8212baa1c3f7a03f490ce0d

8 years agoMerge "Put the legacy stdio fds back for pre-M."
Treehugger Robot [Fri, 15 Jul 2016 21:33:00 +0000 (21:33 +0000)]
Merge "Put the legacy stdio fds back for pre-M."

8 years agoMerge \\"Add an alias for _CTYPE_N.\\" am: 730fa648c2
Dan Albert [Fri, 15 Jul 2016 21:05:23 +0000 (21:05 +0000)]
Merge \\"Add an alias for _CTYPE_N.\\" am: 730fa648c2
am: 32d7ca35ec

Change-Id: I68f304c9160874cd6e4f99470338f86b7a3d276f

8 years agoMerge \"Add an alias for _CTYPE_N.\"
Dan Albert [Fri, 15 Jul 2016 21:02:25 +0000 (21:02 +0000)]
Merge \"Add an alias for _CTYPE_N.\"
am: 730fa648c2

Change-Id: I84e7abe390146bfb2deb0987ccd997fd11c7d6aa

8 years agoMerge "Add an alias for _CTYPE_N."
Treehugger Robot [Fri, 15 Jul 2016 20:56:01 +0000 (20:56 +0000)]
Merge "Add an alias for _CTYPE_N."

8 years agoConvert linker from Android.mk to Android.bp
Colin Cross [Thu, 14 Jul 2016 23:05:46 +0000 (16:05 -0700)]
Convert linker from Android.mk to Android.bp

Change-Id: Ibf7da301defb2fd7e24fb3f4cd2e967a8f376497

8 years agoPut the legacy stdio fds back for pre-M.
Dan Albert [Fri, 15 Jul 2016 18:32:23 +0000 (11:32 -0700)]
Put the legacy stdio fds back for pre-M.

Change-Id: I2e397b04cba2969b9f9a3767b9b2fd12a289fcd2

8 years agoAdd an alias for _CTYPE_N.
Dan Albert [Fri, 15 Jul 2016 18:31:11 +0000 (11:31 -0700)]
Add an alias for _CTYPE_N.

gnustl is using this. It would be easy to change gnustl to *not* use
it for Android, but we've had this in released NDKs for years now so
we probably need this anyway.

Change-Id: I398a550664bf4ccbd9ea54f53c65428293a599a4

8 years agoMerge \\"Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC.\\" am: a24a2...
Yabin Cui [Fri, 15 Jul 2016 01:42:11 +0000 (01:42 +0000)]
Merge \\"Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC.\\" am: a24a2476d0
am: cd165f63c2

Change-Id: I2894b396e8dfd309a21eac2fc2c68bcb265ebce1

8 years agoMerge \"Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC.\"
Yabin Cui [Fri, 15 Jul 2016 01:39:12 +0000 (01:39 +0000)]
Merge \"Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC.\"
am: a24a2476d0

Change-Id: I5d1ebca87932f915fc33dd44d3b383e83b940d90

8 years agoMerge "Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC."
Yabin Cui [Fri, 15 Jul 2016 01:29:28 +0000 (01:29 +0000)]
Merge "Force pthread_cond_timedwait_relative_np using CLOCK_MONOTONIC."

8 years agoMerge \\"Fix clean mma in bionic\\" am: 1e4a945f27
Colin Cross [Fri, 15 Jul 2016 01:04:08 +0000 (01:04 +0000)]
Merge \\"Fix clean mma in bionic\\" am: 1e4a945f27
am: 14bef04838

Change-Id: I0aa661c0ef65ca8eb763347c29c24fa122c847df

8 years agoMerge \"Fix clean mma in bionic\"
Colin Cross [Fri, 15 Jul 2016 01:00:44 +0000 (01:00 +0000)]
Merge \"Fix clean mma in bionic\"
am: 1e4a945f27

Change-Id: Ie6e69b74c7c1fa044db5e6eed58981ef0d57af28

8 years agoMerge "Fix clean mma in bionic"
Treehugger Robot [Fri, 15 Jul 2016 00:52:37 +0000 (00:52 +0000)]
Merge "Fix clean mma in bionic"

8 years agoAdd a test for a known kernel bug.
Elliott Hughes [Fri, 15 Jul 2016 00:07:17 +0000 (17:07 -0700)]
Add a test for a known kernel bug.

Bug: http://b/27265969
Change-Id: I981cb6a91015bd17d362987ed12c8ca638987c5b

8 years agoFix clean mma in bionic
Colin Cross [Thu, 14 Jul 2016 23:53:18 +0000 (16:53 -0700)]
Fix clean mma in bionic

Change-Id: If2410c5ff9c08372098e5ec831e33e4da0e04b30

8 years agoMerge \\"Convert bionic benchmarks and tests to Android.bp\\" am: 55653cc33b
Colin Cross [Thu, 14 Jul 2016 21:13:52 +0000 (21:13 +0000)]
Merge \\"Convert bionic benchmarks and tests to Android.bp\\" am: 55653cc33b
am: 2d61b5bc3a

Change-Id: Idaa5a2b6294e9b6ac8671812219c09e321443a15

8 years agoMerge \"Convert bionic benchmarks and tests to Android.bp\"
Colin Cross [Thu, 14 Jul 2016 21:11:23 +0000 (21:11 +0000)]
Merge \"Convert bionic benchmarks and tests to Android.bp\"
am: 55653cc33b

Change-Id: I577eb6db457bfbc520ca4528315715674173c489

8 years agoMerge "Convert bionic benchmarks and tests to Android.bp"
Treehugger Robot [Thu, 14 Jul 2016 21:05:27 +0000 (21:05 +0000)]
Merge "Convert bionic benchmarks and tests to Android.bp"

8 years agoMerge \\"Fix typo in the comment\\" am: d0e764f91e
Dimitry Ivanov [Thu, 14 Jul 2016 20:17:47 +0000 (20:17 +0000)]
Merge \\"Fix typo in the comment\\" am: d0e764f91e
am: deabb9030b

Change-Id: Ia5a3f485e5ee3aa57fab05d7b128376190c9e4d0

8 years agoMerge \"Fix typo in the comment\"
Dimitry Ivanov [Thu, 14 Jul 2016 20:14:51 +0000 (20:14 +0000)]
Merge \"Fix typo in the comment\"
am: d0e764f91e

Change-Id: Id4579211e39c2806debcda66c971473de7b2d2b6

8 years agoMerge "Fix typo in the comment"
Treehugger Robot [Thu, 14 Jul 2016 20:11:20 +0000 (20:11 +0000)]
Merge "Fix typo in the comment"

8 years agoMerge \\"Convert malloc_debug from Android.mk to Android.bp\\" am: 0393437b53
Colin Cross [Thu, 14 Jul 2016 19:49:44 +0000 (19:49 +0000)]
Merge \\"Convert malloc_debug from Android.mk to Android.bp\\" am: 0393437b53
am: f45e58585c

Change-Id: I39f6281dd70582765e56a3aeb7f23fe2678fe5a5

8 years agoMerge \"Convert malloc_debug from Android.mk to Android.bp\"
Colin Cross [Thu, 14 Jul 2016 19:47:18 +0000 (19:47 +0000)]
Merge \"Convert malloc_debug from Android.mk to Android.bp\"
am: 0393437b53

Change-Id: Iea3dbd038677e42075c6be87fceeb32e442ae152

8 years agoMerge "Convert malloc_debug from Android.mk to Android.bp"
Colin Cross [Thu, 14 Jul 2016 19:43:29 +0000 (19:43 +0000)]
Merge "Convert malloc_debug from Android.mk to Android.bp"

8 years agoMerge \\"Move relocation_packer from Android.mk to Android.bp\\" am: 41933386c0
Colin Cross [Thu, 14 Jul 2016 19:42:15 +0000 (19:42 +0000)]
Merge \\"Move relocation_packer from Android.mk to Android.bp\\" am: 41933386c0
am: 0b6963e5b1

Change-Id: I607ff599cf3a7508f733942eb73b65a7ec5ff053

8 years agoMerge \"Move relocation_packer from Android.mk to Android.bp\"
Colin Cross [Thu, 14 Jul 2016 19:39:18 +0000 (19:39 +0000)]
Merge \"Move relocation_packer from Android.mk to Android.bp\"
am: 41933386c0

Change-Id: Iaac010c42c1c1d75cd36645a8b25e89a05abac06