OSDN Git Service
Elliott Hughes [Thu, 19 Nov 2015 23:00:34 +0000 (23:00 +0000)]
Add <sysexits.h>.
am:
e924d8528c
* commit '
e924d8528cc566ee5569a42c92e9f698c857d48a':
Add <sysexits.h>.
Junichi Uekawa [Thu, 19 Nov 2015 12:55:19 +0000 (12:55 +0000)]
Merge "Do not depend on host bits to get the right size to write." am:
313632db57
am:
1ab4088062
* commit '
1ab4088062ffdebbb82e5cf1fe9819fb6cc76555':
Do not depend on host bits to get the right size to write.
Junichi Uekawa [Thu, 19 Nov 2015 12:51:01 +0000 (12:51 +0000)]
Merge "Do not depend on host bits to get the right size to write."
am:
313632db57
* commit '
313632db574d101275206ca025d21a5a3cd62150':
Do not depend on host bits to get the right size to write.
Junichi Uekawa [Thu, 19 Nov 2015 12:44:19 +0000 (12:44 +0000)]
Merge "Do not depend on host bits to get the right size to write."
Junichi Uekawa [Wed, 18 Nov 2015 01:18:59 +0000 (10:18 +0900)]
Do not depend on host bits to get the right size to write.
x86_64 32-bit or 64-bit relocations do not depend on ELF bit size, they
are 32-bit or 64-bit respectively.
Known compiler that emits such code is nacl-clang which emits
R_X86_64_PC32 which should write 32 bits but ended up writing 64 bits.
Change-Id: Ibb6b484c0fea6a7e291362148e8ac749d6674529
Yabin Cui [Thu, 19 Nov 2015 02:09:25 +0000 (02:09 +0000)]
Merge "Implement pthread spin." am:
2c09e5de29
am:
f091c1f2f1
* commit '
f091c1f2f1cf7f363ba59c08b88f1fb5de05607d':
Implement pthread spin.
Yabin Cui [Thu, 19 Nov 2015 02:09:14 +0000 (02:09 +0000)]
Merge "Avoid tsan warning about pthread_mutex_destroy." am:
ea5bb151af
am:
9d4bd6f0ca
* commit '
9d4bd6f0caa0d1d7947767a7ea3517c2a764e7e6':
Avoid tsan warning about pthread_mutex_destroy.
Yabin Cui [Thu, 19 Nov 2015 02:03:24 +0000 (02:03 +0000)]
Merge "Implement pthread spin."
am:
2c09e5de29
* commit '
2c09e5de299ca87a9e68807e2b4af41ba61710f3':
Implement pthread spin.
Yabin Cui [Thu, 19 Nov 2015 02:03:13 +0000 (02:03 +0000)]
Merge "Avoid tsan warning about pthread_mutex_destroy."
am:
ea5bb151af
* commit '
ea5bb151af5e1e364968cb1eac70c8a2c13ca7a7':
Avoid tsan warning about pthread_mutex_destroy.
Yabin Cui [Thu, 19 Nov 2015 01:55:37 +0000 (01:55 +0000)]
Merge "Implement pthread spin."
Yabin Cui [Thu, 19 Nov 2015 01:55:25 +0000 (01:55 +0000)]
Merge "Avoid tsan warning about pthread_mutex_destroy."
Yabin Cui [Wed, 18 Nov 2015 00:03:18 +0000 (16:03 -0800)]
Implement pthread spin.
In order to run tsan unit tests, we need to support pthread spin APIs.
Bug:
18623621
Bug:
25392375
Change-Id: Icbb4a74e72e467824b3715982a01600031868e29
Dimitry Ivanov [Wed, 18 Nov 2015 17:20:26 +0000 (17:20 +0000)]
Merge "Ignore target sdk version for the public namespace" am:
63f0e0db76
am:
3f539a1655
* commit '
3f539a16555739cc5d429926d29870f8661a6c54':
Ignore target sdk version for the public namespace
Dimitry Ivanov [Wed, 18 Nov 2015 03:52:50 +0000 (03:52 +0000)]
Merge "Ignore target sdk version for the public namespace"
am:
63f0e0db76
* commit '
63f0e0db768ea9be4db3dd6a2fb62ea942afb9d6':
Ignore target sdk version for the public namespace
Dimitry Ivanov [Wed, 18 Nov 2015 03:43:59 +0000 (03:43 +0000)]
Merge "Ignore target sdk version for the public namespace"
Dmitriy Ivanov [Wed, 18 Nov 2015 02:36:50 +0000 (18:36 -0800)]
Ignore target sdk version for the public namespace
This fixes the bug with using the libraries loaded
prior to android_set_target_sdk_version call.
Bug: http://b/
22548808
Change-Id: I3ca2d367b0fa930a437bbb65f780834803d2ef0a
Yabin Cui [Tue, 17 Nov 2015 04:19:31 +0000 (20:19 -0800)]
Avoid tsan warning about pthread_mutex_destroy.
If calling pthread_mutex_trylock from pthread_mutex_destroy, tsan
warns about an attempt to destroy a locked mutex.
Bug:
25392375
Change-Id: I5feee20e7a0d0915adad24da874ec1ccce241381
Yabin Cui [Tue, 17 Nov 2015 00:32:03 +0000 (00:32 +0000)]
Merge "Implement pthread barrier." am:
b804b9d67b
am:
278fe431b6
* commit '
278fe431b6045527f379f69dbdd25e66a434c949':
Implement pthread barrier.
Yabin Cui [Tue, 17 Nov 2015 00:28:20 +0000 (00:28 +0000)]
Merge "Implement pthread barrier."
am:
b804b9d67b
* commit '
b804b9d67b9e3a8c63471ff9892f6abea2a58684':
Implement pthread barrier.
Yabin Cui [Tue, 17 Nov 2015 00:22:54 +0000 (00:22 +0000)]
Merge "Implement pthread barrier."
Dimitry Ivanov [Mon, 16 Nov 2015 22:33:24 +0000 (22:33 +0000)]
Merge "Remove the warning about empty LD_LIBRARY_PATH" am:
3c8c16022a
am:
159c3d617f
* commit '
159c3d617fb5f1d9bfb32681a1e526a7798892fe':
Remove the warning about empty LD_LIBRARY_PATH
Dimitry Ivanov [Mon, 16 Nov 2015 22:30:32 +0000 (22:30 +0000)]
Merge "Remove the warning about empty LD_LIBRARY_PATH"
am:
3c8c16022a
* commit '
3c8c16022a513a32eb6b92cf23f4ef43ccf7ad6d':
Remove the warning about empty LD_LIBRARY_PATH
Elliott Hughes [Mon, 29 Jun 2015 20:44:34 +0000 (13:44 -0700)]
Add <sysexits.h>.
Taken from current upstream OpenBSD.
Bug: http://b/
22172963
(cherry picked from commit
59d5854d145263f8e68a7312bf52894269203029)
Change-Id: Ie9e16789b7a248ac004e19ebf8ad01679208d332
Dimitry Ivanov [Mon, 16 Nov 2015 22:25:50 +0000 (22:25 +0000)]
Merge "Remove the warning about empty LD_LIBRARY_PATH"
Dmitriy Ivanov [Mon, 16 Nov 2015 22:23:37 +0000 (14:23 -0800)]
Remove the warning about empty LD_LIBRARY_PATH
Change-Id: I3eca11512d8055ab94dd0a6badcd83ce6440d675
Yabin Cui [Fri, 6 Nov 2015 06:06:09 +0000 (22:06 -0800)]
Implement pthread barrier.
Bug:
24341262
Change-Id: I5472549e5d7545c1c3f0bef78235f545557b9630
Chih-hung Hsieh [Mon, 16 Nov 2015 21:41:36 +0000 (21:41 +0000)]
Merge "Enable clang to compile more tests." am:
949bfb9e3c
am:
4d87f17621
* commit '
4d87f1762116a1a4392b96a49a2cb56640289ba1':
Enable clang to compile more tests.
Chih-hung Hsieh [Mon, 16 Nov 2015 21:36:51 +0000 (21:36 +0000)]
Merge "Enable clang to compile more tests."
am:
949bfb9e3c
* commit '
949bfb9e3cceac7913fe1debc39617c9ec01ae5e':
Enable clang to compile more tests.
Chih-hung Hsieh [Mon, 16 Nov 2015 21:31:36 +0000 (21:31 +0000)]
Merge "Enable clang to compile more tests."
Dimitry Ivanov [Mon, 16 Nov 2015 21:29:35 +0000 (21:29 +0000)]
Merge "Fix arm64 and x86 builds" am:
61f186d067
am:
b061c9250d
* commit '
b061c9250d26a3735baeabb37a8eb63389fddafb':
Fix arm64 and x86 builds
Dimitry Ivanov [Mon, 16 Nov 2015 21:25:31 +0000 (21:25 +0000)]
Merge "Fix arm64 and x86 builds"
am:
61f186d067
* commit '
61f186d067a3efb6a86450092a567fb18c1641c3':
Fix arm64 and x86 builds
Dimitry Ivanov [Mon, 16 Nov 2015 21:23:18 +0000 (21:23 +0000)]
Merge "Fix arm64 and x86 builds"
Dmitriy Ivanov [Mon, 16 Nov 2015 21:17:27 +0000 (13:17 -0800)]
Fix arm64 and x86 builds
Change-Id: Ic3746b2f200f42218b6ac857c1631e873c767c17
Dimitry Ivanov [Mon, 16 Nov 2015 20:26:18 +0000 (20:26 +0000)]
Merge "Introducing linker namespaces" am:
1f0ccbb59c
am:
2616cdcdb9
* commit '
2616cdcdb9a03ddb80ad844b3f6649483a9a9469':
Introducing linker namespaces
Dimitry Ivanov [Mon, 16 Nov 2015 20:21:05 +0000 (20:21 +0000)]
Merge "Introducing linker namespaces"
am:
1f0ccbb59c
* commit '
1f0ccbb59cd32dfad0e6d9fd9619905e067076a6':
Introducing linker namespaces
Dimitry Ivanov [Mon, 16 Nov 2015 20:14:37 +0000 (20:14 +0000)]
Merge "Introducing linker namespaces"
Chih-Hung Hsieh [Mon, 16 Nov 2015 19:13:04 +0000 (11:13 -0800)]
Enable clang to compile more tests.
* Disable optimization only in gtest.h of atexit_test.c for arm/aarch64
to keep VTT for std::__1::basic_stringstream<char, std::__1::char_traits<char>,
std::__1::allocator<char> > to link with g++ compiled modules.
* bionic-unit-tests source files are not affected by clang x86_64 fp128 bug
so they can be compiled with clang.
BUG:
25643775
Change-Id: I3da2a0de61edcdca07b7fcd73a16de9da4a1f7d6
Dmitriy Ivanov [Fri, 30 Oct 2015 00:01:24 +0000 (17:01 -0700)]
Introducing linker namespaces
Bug: http://b/
22548808
Change-Id: Ia3af3c0a167f1d16447a3d83bb045d143319b1e1
Elliott Hughes [Fri, 13 Nov 2015 18:32:04 +0000 (18:32 +0000)]
Merge "Improve libc time zone fallback behavior." am:
1b42c54471
am:
69536213d6
* commit '
69536213d6c5984438880cdd897e646511a51a17':
Improve libc time zone fallback behavior.
Elliott Hughes [Fri, 13 Nov 2015 18:28:57 +0000 (18:28 +0000)]
Merge "Improve libc time zone fallback behavior."
am:
1b42c54471
* commit '
1b42c544711316281e09c5da25850fac531b27cb':
Improve libc time zone fallback behavior.
Elliott Hughes [Fri, 13 Nov 2015 18:24:41 +0000 (18:24 +0000)]
Merge "Improve libc time zone fallback behavior."
Elliott Hughes [Fri, 13 Nov 2015 16:38:48 +0000 (08:38 -0800)]
Improve libc time zone fallback behavior.
We should fall back to GMT if neither the environment variable nor the
system property is set. This is the case if you wipe a WiFi-only device,
because we currently only take the time zone from cell networks.
Bug: http://b/
24773112
Change-Id: I90d236d4d492b6562d75021bd312030b91c1e298
Elliott Hughes [Fri, 13 Nov 2015 03:08:30 +0000 (03:08 +0000)]
Merge "Fix strftime if tm_zone is null." am:
5780f9d809
am:
5187baa387
* commit '
5187baa387dcd73cb99c45897949a6353db7175a':
Fix strftime if tm_zone is null.
Elliott Hughes [Fri, 13 Nov 2015 03:04:31 +0000 (03:04 +0000)]
Merge "Fix strftime if tm_zone is null."
am:
5780f9d809
* commit '
5780f9d80963fbe7b93f501dd3dd7edc7fab46b0':
Fix strftime if tm_zone is null.
Elliott Hughes [Fri, 13 Nov 2015 02:58:30 +0000 (02:58 +0000)]
Merge "Fix strftime if tm_zone is null."
Nick Kralevich [Fri, 13 Nov 2015 01:15:20 +0000 (01:15 +0000)]
Merge "FORTIFY_SOURCE: make sure gcc unittests are compiled with gcc" am:
4ea67f6950
am:
bb725f7b77
* commit '
bb725f7b7760f7b1c5ed9a07d6f10619d5abdd6e':
FORTIFY_SOURCE: make sure gcc unittests are compiled with gcc
Nick Kralevich [Fri, 13 Nov 2015 01:12:41 +0000 (01:12 +0000)]
Merge "FORTIFY_SOURCE: make sure gcc unittests are compiled with gcc"
am:
4ea67f6950
* commit '
4ea67f695066b73796b24563d83e8b5a9190334d':
FORTIFY_SOURCE: make sure gcc unittests are compiled with gcc
Nick Kralevich [Fri, 13 Nov 2015 01:09:44 +0000 (01:09 +0000)]
Merge "FORTIFY_SOURCE: make sure gcc unittests are compiled with gcc"
Elliott Hughes [Fri, 13 Nov 2015 00:51:31 +0000 (16:51 -0800)]
Fix strftime if tm_zone is null.
Upstream tzcode said "On platforms with tm_zone, strftime.c now assumes it
is not NULL". Which is fine for any struct tm generated by tzcode, but not
necessarily true of a struct tm constructed by arbitrary code. In particular,
Netflix on Nexus Player was failing to start because they format "%Z" with
a struct tm whose tm_zone is null (the other fields are valid, but, yeah,
that's probably not intentional).
glibc takes a null tm_zone to mean "the current time zone", so let's do that
too. (Historically Android would use the empty string, and POSIX doesn't
clarify which of this is the appropriate behavior when tm_zone is null.)
Bug: http://b/
25170306
Change-Id: Idbf68bfe90d143aca7dada8607742905188b1d33
Nick Kralevich [Thu, 12 Nov 2015 23:55:13 +0000 (15:55 -0800)]
FORTIFY_SOURCE: make sure gcc unittests are compiled with gcc
The default compiler is clang. We need to explicitly indicate
that we should use gcc.
Change-Id: I37859c2e303f2a86a2565fe72eda1fda7c557a59
Chih-hung Hsieh [Thu, 12 Nov 2015 20:54:54 +0000 (20:54 +0000)]
Merge "Still cannot compile with clang on arm64." am:
7c10ee9473
am:
a2e9d90811
* commit '
a2e9d90811c98a43cf337503a488d56d39d27628':
Still cannot compile with clang on arm64.
Chih-hung Hsieh [Thu, 12 Nov 2015 20:51:05 +0000 (20:51 +0000)]
Merge "Still cannot compile with clang on arm64."
am:
7c10ee9473
* commit '
7c10ee9473b5c46da733b2d3d24cf90fb8ac7672':
Still cannot compile with clang on arm64.
Chih-hung Hsieh [Thu, 12 Nov 2015 20:45:48 +0000 (20:45 +0000)]
Merge "Still cannot compile with clang on arm64."
Chih-Hung Hsieh [Thu, 12 Nov 2015 20:39:13 +0000 (12:39 -0800)]
Still cannot compile with clang on arm64.
When __cxa_thread_atexit_impl.cpp is compiled with clang on arm64,
Android cannot boot up.
BUG:
25662915
Change-Id: If997b544f43e956172ce605d86fe147d42fd39e0
Chih-hung Hsieh [Thu, 12 Nov 2015 01:13:29 +0000 (01:13 +0000)]
Merge "Enable clang for modules failed with TLS." am:
0c447053de
am:
c0116bd3db
* commit '
c0116bd3dbd5652e70643c239e58d4d225f83098':
Enable clang for modules failed with TLS.
Chih-hung Hsieh [Thu, 12 Nov 2015 01:09:37 +0000 (01:09 +0000)]
Merge "Enable clang for modules failed with TLS."
am:
0c447053de
* commit '
0c447053de4b87d50ebec260c7e1d949fe934065':
Enable clang for modules failed with TLS.
Elliott Hughes [Thu, 12 Nov 2015 01:09:31 +0000 (01:09 +0000)]
Merge "Clean up pthread_gettid_np test." am:
dbc6398e95
am:
fd57638117
* commit '
fd57638117c45849eae495d812a12c6d68330e3d':
Clean up pthread_gettid_np test.
Chih-hung Hsieh [Thu, 12 Nov 2015 01:04:51 +0000 (01:04 +0000)]
Merge "Enable clang for modules failed with TLS."
Elliott Hughes [Thu, 12 Nov 2015 01:04:38 +0000 (01:04 +0000)]
Merge "Clean up pthread_gettid_np test."
am:
dbc6398e95
* commit '
dbc6398e95df44a18715ce5ba19b8e1a93b969d4':
Clean up pthread_gettid_np test.
Elliott Hughes [Thu, 12 Nov 2015 00:59:08 +0000 (00:59 +0000)]
Merge "Clean up pthread_gettid_np test."
Chih-Hung Hsieh [Tue, 10 Nov 2015 19:15:43 +0000 (11:15 -0800)]
Enable clang for modules failed with TLS.
New 3.8 clang/llvm can compile TLS code now.
* For x86_64, still disable clang due to f128 bug.
* For b/
25643775, arm and arm64, disable clang in unit tests.
* Fix thread_local_test.cpp to compile with clang and
limit gcc workaround only to arm and aarch64.
BUG:
25643775
Change-Id: Iecd006bf1fc417dbcce2c63343a59c4bf1fa77ea
Josh Gao [Wed, 11 Nov 2015 22:28:45 +0000 (22:28 +0000)]
Merge "Add 100 column limit to .clang-format." am:
b03e6bf924
am:
504e3274a0
* commit '
504e3274a09f32834e3c5c8b6af308230f3cbedf':
Add 100 column limit to .clang-format.
Josh Gao [Wed, 11 Nov 2015 22:25:42 +0000 (22:25 +0000)]
Merge "Add 100 column limit to .clang-format."
am:
b03e6bf924
* commit '
b03e6bf9247bb36162b9f4c61d07e488a18e126c':
Add 100 column limit to .clang-format.
Josh Gao [Wed, 11 Nov 2015 22:22:59 +0000 (22:22 +0000)]
Merge "Add 100 column limit to .clang-format."
Josh Gao [Wed, 11 Nov 2015 22:21:09 +0000 (14:21 -0800)]
Add 100 column limit to .clang-format.
Change-Id: I3c3fa5e61cfb2af7f2888dcee56229692ec1479c
Elliott Hughes [Wed, 11 Nov 2015 21:32:28 +0000 (13:32 -0800)]
Clean up pthread_gettid_np test.
Change-Id: I0fad26c7824981bfa3ad3a8a0b28a1984062dcd1
Elliott Hughes [Wed, 11 Nov 2015 21:29:13 +0000 (21:29 +0000)]
Merge "Fix potential race condition on CTS TC pthread_gettid_np" am:
ffe5c24c86
am:
2b1e258fec
* commit '
2b1e258fec89a5abd20f6d7ee8a102cd9b2c27bc':
Fix potential race condition on CTS TC pthread_gettid_np
Elliott Hughes [Wed, 11 Nov 2015 21:25:38 +0000 (21:25 +0000)]
Merge "Fix potential race condition on CTS TC pthread_gettid_np"
am:
ffe5c24c86
* commit '
ffe5c24c8693f1f4fc8edb68075fb36df558b801':
Fix potential race condition on CTS TC pthread_gettid_np
Elliott Hughes [Wed, 11 Nov 2015 21:21:33 +0000 (21:21 +0000)]
Merge "Fix potential race condition on CTS TC pthread_gettid_np"
Junjie Hu [Wed, 11 Nov 2015 04:52:25 +0000 (12:52 +0800)]
Fix potential race condition on CTS TC pthread_gettid_np
Root cause:
If start_routine thread exits before pthread_gettid_np is invokded, the "tid" field
will be cleared so that pthread_gettid_np will get "0" (which is cleared by kernel,
due to the flag "CLONE_CHILD_CLEARTID" is set while calling clone system call inside
pthread_create).
Proposed patch:
Use a mutex to guarantee pthread_gettid_np will be invoked and returned before the
start_routine exits
Signed-off-by: Junjie Hu <junjie.hu@mediatek.com>
Change-Id: I22411f1b0f7446d76a0373cef4ccec858fac7018
(cherry picked from commit
4f8010293506d4e08d184e66bf4af44ef3483611)
Daniel Xie [Wed, 11 Nov 2015 19:24:46 +0000 (19:24 +0000)]
Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev am:
2010fb6722 am:
eebe01b523
am:
1a5bfd9eaf
* commit '
1a5bfd9eaf22eaf9fcc54d3065d0e88bff4f3e42':
Fix potential race condition on CTS TC pthread_gettid_np
Daniel Xie [Wed, 11 Nov 2015 19:00:17 +0000 (19:00 +0000)]
Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev am:
2010fb6722
am:
eebe01b523
* commit '
eebe01b523075c0634b04463c210510f192f154d':
Fix potential race condition on CTS TC pthread_gettid_np
Daniel Xie [Wed, 11 Nov 2015 18:57:14 +0000 (18:57 +0000)]
Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev
am:
2010fb6722
* commit '
2010fb6722ea2bd9d07c9f0a3e69eafa3d6114e9':
Fix potential race condition on CTS TC pthread_gettid_np
Daniel Xie [Wed, 11 Nov 2015 18:53:16 +0000 (18:53 +0000)]
Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev
Junjie Hu [Wed, 11 Nov 2015 04:52:25 +0000 (12:52 +0800)]
Fix potential race condition on CTS TC pthread_gettid_np
Root cause:
If start_routine thread exits before pthread_gettid_np is invokded, the "tid" field
will be cleared so that pthread_gettid_np will get "0" (which is cleared by kernel,
due to the flag "CLONE_CHILD_CLEARTID" is set while calling clone system call inside
pthread_create).
Proposed patch:
Use a mutex to guarantee pthread_gettid_np will be invoked and returned before the
start_routine exits
Signed-off-by: Junjie Hu <junjie.hu@mediatek.com>
Change-Id: I22411f1b0f7446d76a0373cef4ccec858fac7018
Nick Kralevich [Wed, 11 Nov 2015 02:12:53 +0000 (02:12 +0000)]
Merge "libc_init_common.cpp: Clarify when environment stripping occurs" am:
6209b99a73
am:
8640233fef
* commit '
8640233fef3abafebc6aaa4e64d4f509d84727b9':
libc_init_common.cpp: Clarify when environment stripping occurs
Nick Kralevich [Wed, 11 Nov 2015 02:09:36 +0000 (02:09 +0000)]
Merge "libc_init_common.cpp: Clarify when environment stripping occurs"
am:
6209b99a73
* commit '
6209b99a7351ed732ab25bb2ffa75465366b244f':
libc_init_common.cpp: Clarify when environment stripping occurs
Nick Kralevich [Wed, 11 Nov 2015 02:06:59 +0000 (02:06 +0000)]
Merge "libc_init_common.cpp: Clarify when environment stripping occurs"
Nick Kralevich [Wed, 11 Nov 2015 00:39:29 +0000 (16:39 -0800)]
libc_init_common.cpp: Clarify when environment stripping occurs
The current comment implies that we only strip sensitive
environment variables on executing a setuid program. This is
true but incomplete. The AT_SECURE flag is set whenever a
security transition occurs, such as executing a setuid program,
SELinux security transition, executing a file with file capabilities,
etc...
Fixup the comments.
Change-Id: I30a73992adfde14d6e5f642b3a1ead2ee56726be
Tom Cherry [Tue, 10 Nov 2015 22:02:02 +0000 (22:02 +0000)]
Merge "Refactor prop_area into a class" am:
2a7f1b335d
am:
8e86f33690
* commit '
8e86f33690bf370dd381a3023ae369cd996df967':
Refactor prop_area into a class
Tom Cherry [Tue, 10 Nov 2015 21:58:23 +0000 (21:58 +0000)]
Merge "Refactor prop_area into a class"
am:
2a7f1b335d
* commit '
2a7f1b335dcd08a480c4acc948ba202bae1a0a1f':
Refactor prop_area into a class
Tom Cherry [Tue, 10 Nov 2015 21:54:39 +0000 (21:54 +0000)]
Merge "Refactor prop_area into a class"
Tom Cherry [Wed, 23 Sep 2015 22:34:40 +0000 (15:34 -0700)]
Refactor prop_area into a class
Bug
21852512
Change-Id: I432bf592f1a71a046c32616fc334ad77c220f0ca
Josh Gao [Tue, 10 Nov 2015 00:12:08 +0000 (00:12 +0000)]
Merge "Fix test failure." am:
11b3916b83
am:
2fdaa6c599
* commit '
2fdaa6c599657264b7dda3008f9daa1eff3267ae':
Fix test failure.
Josh Gao [Tue, 10 Nov 2015 00:10:20 +0000 (00:10 +0000)]
Merge "Fix test failure."
am:
11b3916b83
* commit '
11b3916b83e33fce9e3123659fe4e61ef84d39b5':
Fix test failure.
Josh Gao [Tue, 10 Nov 2015 00:08:09 +0000 (00:08 +0000)]
Merge "Fix test failure."
Josh Gao [Tue, 10 Nov 2015 00:04:50 +0000 (16:04 -0800)]
Fix test failure.
Bug: http://b/
25596173
Change-Id: I0cf8f550837d4a936d6a784063a0ec9509150358
Dan Willemsen [Mon, 9 Nov 2015 22:36:20 +0000 (22:36 +0000)]
Merge "Update Android.bp with latest Android.mk changes" am:
704e048cbf
am:
dcf501913d
* commit '
dcf501913d1537b2b980aeee6b4a8bb6da0eb0d5':
Update Android.bp with latest Android.mk changes
Dan Willemsen [Mon, 9 Nov 2015 22:31:50 +0000 (22:31 +0000)]
Merge "Update Android.bp with latest Android.mk changes"
am:
704e048cbf
* commit '
704e048cbfcb69b7906371f9f4cae4cb6357096e':
Update Android.bp with latest Android.mk changes
Dan Willemsen [Mon, 9 Nov 2015 22:28:18 +0000 (22:28 +0000)]
Merge "Update Android.bp with latest Android.mk changes"
Dan Willemsen [Mon, 9 Nov 2015 22:03:46 +0000 (14:03 -0800)]
Update Android.bp with latest Android.mk changes
Change-Id: I45f6292fcc4d4559519d88f948b4478204b08f25
Yabin Cui [Sat, 7 Nov 2015 00:33:21 +0000 (00:33 +0000)]
Merge "Add fileno_unlocked to support thread sanitizer." am:
0e6542b75b
am:
a74eb4dbf5
* commit '
a74eb4dbf5ec0ec397ce0517d30886e29b268c19':
Add fileno_unlocked to support thread sanitizer.
Yabin Cui [Sat, 7 Nov 2015 00:30:09 +0000 (00:30 +0000)]
Merge "Add fileno_unlocked to support thread sanitizer."
am:
0e6542b75b
* commit '
0e6542b75b2f3ca155b452782d2122f34f807485':
Add fileno_unlocked to support thread sanitizer.
Yabin Cui [Sat, 7 Nov 2015 00:24:52 +0000 (00:24 +0000)]
Merge "Add fileno_unlocked to support thread sanitizer."
Yabin Cui [Sat, 7 Nov 2015 00:13:47 +0000 (16:13 -0800)]
Add fileno_unlocked to support thread sanitizer.
Bug:
25392375
Change-Id: If3f92a0e08a53f4b59e01397e8efa307d8572349
Elliott Hughes [Fri, 6 Nov 2015 21:28:09 +0000 (21:28 +0000)]
Merge "fix the mremap signature" am:
8b5b2c4672
am:
4eba804ca0
* commit '
4eba804ca0f4861508c86f95b33c80c2612e3b6f':
fix the mremap signature
Elliott Hughes [Fri, 6 Nov 2015 21:24:59 +0000 (21:24 +0000)]
Merge "fix the mremap signature"
am:
8b5b2c4672
* commit '
8b5b2c467281de502ba1c8ffbe447ef95fbf5219':
fix the mremap signature
Elliott Hughes [Fri, 6 Nov 2015 21:18:08 +0000 (21:18 +0000)]
Merge "fix the mremap signature"
Daniel Micay [Tue, 3 Nov 2015 10:14:08 +0000 (05:14 -0500)]
fix the mremap signature
The mremap definition was incorrect (unsigned long instead of int) and
it was missing the optional new_address parameter.
Change-Id: Ib9d0675aaa098c21617cedc9b2b8cf267be3aec4
Dimitry Ivanov [Fri, 6 Nov 2015 19:04:21 +0000 (19:04 +0000)]
Merge "linker: cleanup solist after unsuccessful read" am:
3482613685
am:
bc0b61e407
* commit '
bc0b61e407045748f7abf678fef5ca20ea668767':
linker: cleanup solist after unsuccessful read
OSDN Git Service
