OSDN Git Service
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"
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
Dimitry Ivanov [Fri, 6 Nov 2015 19:02:08 +0000 (19:02 +0000)]
Merge "linker: cleanup solist after unsuccessful read"
am:
3482613685
* commit '
3482613685342da365a7569220f8e6c27a1fe7e5':
linker: cleanup solist after unsuccessful read
Dimitry Ivanov [Fri, 6 Nov 2015 19:00:24 +0000 (19:00 +0000)]
Merge "linker: cleanup solist after unsuccessful read"
Dmitriy Ivanov [Fri, 6 Nov 2015 18:44:37 +0000 (10:44 -0800)]
linker: cleanup solist after unsuccessful read
Bug: http://b/
25560017
Change-Id: I03c5a1d7aed34c480d341aacfb3b1afdfa037b99
Dimitry Ivanov [Fri, 6 Nov 2015 02:37:03 +0000 (02:37 +0000)]
Merge "Fix linked_list::remove_if()" am:
004fead6bc
am:
2dc1e91dba
* commit '
2dc1e91dbac495056aa2d05c2cbb220f61828854':
Fix linked_list::remove_if()
Dimitry Ivanov [Fri, 6 Nov 2015 02:35:02 +0000 (02:35 +0000)]
Merge "Fix linked_list::remove_if()"
am:
004fead6bc
* commit '
004fead6bc55d1e65b4fb9ca1ac36646b99e5fdd':
Fix linked_list::remove_if()
Dimitry Ivanov [Fri, 6 Nov 2015 02:32:34 +0000 (02:32 +0000)]
Merge "Fix linked_list::remove_if()"
Dmitriy Ivanov [Fri, 6 Nov 2015 01:41:05 +0000 (17:41 -0800)]
Fix linked_list::remove_if()
When remove_if removes last element from the list
following push_back stops working.
Change-Id: Ia3e92763b83a2e172eaa10de7aecfb7a4be452d7
Colin Cross [Thu, 5 Nov 2015 02:03:35 +0000 (02:03 +0000)]
Merge "Use cc_defaults" am:
ef5e647891
am:
10c6a7c7b9
* commit '
10c6a7c7b9e920b8a46ba142acfc59fdb3eef11e':
Use cc_defaults
Colin Cross [Thu, 5 Nov 2015 02:00:22 +0000 (02:00 +0000)]
Merge "Use cc_defaults"
am:
ef5e647891
* commit '
ef5e647891f1a0aefeab4a87e9225e47087c6301':
Use cc_defaults
Colin Cross [Thu, 5 Nov 2015 01:56:58 +0000 (01:56 +0000)]
Merge "Use cc_defaults"
Josh Gao [Wed, 4 Nov 2015 22:30:22 +0000 (22:30 +0000)]
Merge "Fix GNU/POSIX basename headers." am:
dd7dcfcfdb
am:
824084ce76
* commit '
824084ce7616376f49af78dfd7894761d7bac7d2':
Fix GNU/POSIX basename headers.
Josh Gao [Wed, 4 Nov 2015 22:28:19 +0000 (22:28 +0000)]
Merge "Fix GNU/POSIX basename headers."
am:
dd7dcfcfdb
* commit '
dd7dcfcfdbab3b38fc40551defdf81c3b734e336':
Fix GNU/POSIX basename headers.
Josh Gao [Wed, 4 Nov 2015 22:26:13 +0000 (22:26 +0000)]
Merge "Fix GNU/POSIX basename headers."
Josh Gao [Wed, 4 Nov 2015 02:46:02 +0000 (18:46 -0800)]
Fix GNU/POSIX basename headers.
Including glibc's <libgen.h> will result in the user getting the POSIX
version of basename always, regardless of when it is included relative
to <string.h>. Prior to this patch, our implementation would result in
the one that's included first winning.
Bug: http://b/
25459151
Change-Id: Id4aaf1670dad317d6bbc05763a84ee87596e8e59
Colin Cross [Sun, 1 Nov 2015 06:03:05 +0000 (23:03 -0700)]
Use cc_defaults
Use a cc_defaults module to reduce duplication.
Change-Id: Iaee6bf20b84123babcdc68d4feb06308f5f61a59
Dan Willemsen [Tue, 3 Nov 2015 23:34:28 +0000 (23:34 +0000)]
Merge "Update Android.bp with arch-specific version scripts" am:
4b920f042a
am:
021d959eba
* commit '
021d959eba77c3f7a17ef01eba3f804e22aa9828':
Update Android.bp with arch-specific version scripts
Josh Gao [Tue, 3 Nov 2015 23:34:24 +0000 (23:34 +0000)]
Merge "fix PTRDIFF_MAX check in the 32-bit mmap wrapper" am:
af909869d8
am:
a59479434c
* commit '
a59479434c7e3944a3f44c8da74002695c6595b3':
fix PTRDIFF_MAX check in the 32-bit mmap wrapper
Bill Yi [Tue, 3 Nov 2015 23:31:30 +0000 (23:31 +0000)]
Dan Willemsen [Tue, 3 Nov 2015 23:26:08 +0000 (23:26 +0000)]
Merge "Update Android.bp with arch-specific version scripts"
am:
4b920f042a
* commit '
4b920f042ac4b35c4dd3ff51f7b8f164a22e3500':
Update Android.bp with arch-specific version scripts
Josh Gao [Tue, 3 Nov 2015 23:25:55 +0000 (23:25 +0000)]
Merge "fix PTRDIFF_MAX check in the 32-bit mmap wrapper"
am:
af909869d8
* commit '
af909869d868585a47914ab51536192da50935cb':
fix PTRDIFF_MAX check in the 32-bit mmap wrapper
Dan Willemsen [Tue, 3 Nov 2015 22:38:23 +0000 (22:38 +0000)]
Merge "Update Android.bp with arch-specific version scripts"
Dan Willemsen [Tue, 3 Nov 2015 22:30:57 +0000 (14:30 -0800)]
Update Android.bp with arch-specific version scripts
Change-Id: I59b34f21b54e8a2084bb318a08c4092064f48083
Bill Yi [Tue, 3 Nov 2015 22:28:57 +0000 (14:28 -0800)]
Josh Gao [Tue, 3 Nov 2015 19:35:05 +0000 (19:35 +0000)]
Merge "fix PTRDIFF_MAX check in the 32-bit mmap wrapper"
Daniel Micay [Tue, 3 Nov 2015 10:30:29 +0000 (05:30 -0500)]
fix PTRDIFF_MAX check in the 32-bit mmap wrapper
It wasn't making use of the page-rounded size.
Change-Id: I911345fcfd6419a4dbc18a4622b42e1b76729abb
Christopher Ferris [Mon, 2 Nov 2015 21:13:16 +0000 (21:13 +0000)]
Merge "Fix comment to reflect the actual reality." am:
e07558fb80
am:
9fe02f3e3c
* commit '
9fe02f3e3ca382aa95fa93ce73a49a5c1141efb1':
Fix comment to reflect the actual reality.
Christopher Ferris [Mon, 2 Nov 2015 21:10:19 +0000 (21:10 +0000)]
Merge "Fix comment to reflect the actual reality."
am:
e07558fb80
* commit '
e07558fb80da4e196e8b7e371041c1e75c56b29b':
Fix comment to reflect the actual reality.
Christopher Ferris [Mon, 2 Nov 2015 21:07:04 +0000 (21:07 +0000)]
Merge "Fix comment to reflect the actual reality."
Christopher Ferris [Mon, 2 Nov 2015 20:56:37 +0000 (12:56 -0800)]
Fix comment to reflect the actual reality.
The original comment implied that Android 32 bit was the only one
using a bad time_t, but it turns out 32 bit glibc has the same time_t
as Android. Update the comment to reflect this reality.
Change-Id: I72cdd2c677a6521f7b43d4695a52fd8fdc3305bd
Dimitry Ivanov [Sat, 31 Oct 2015 18:23:18 +0000 (18:23 +0000)]
Merge "Generate libdl.so per-architecture version script" am:
75dd3710e7
am:
86bf87c054
* commit '
86bf87c0549dfc8b9e3e808735c8830985141257':
Generate libdl.so per-architecture version script
Dimitry Ivanov [Sat, 31 Oct 2015 18:20:28 +0000 (18:20 +0000)]
Merge "Generate libdl.so per-architecture version script"
am:
75dd3710e7
* commit '
75dd3710e72e819ce6710e93672f937550ed3818':
Generate libdl.so per-architecture version script
Dimitry Ivanov [Sat, 31 Oct 2015 18:17:17 +0000 (18:17 +0000)]
Merge "Generate libdl.so per-architecture version script"
Christopher Ferris [Sat, 31 Oct 2015 16:18:08 +0000 (16:18 +0000)]
Merge "Make _signal hidden in all cases." am:
6a8a09f7c4
am:
0ba085de2c
* commit '
0ba085de2c7f481b685f950ba30c95b0cbb25fd7':
Make _signal hidden in all cases.
Christopher Ferris [Sat, 31 Oct 2015 16:15:17 +0000 (16:15 +0000)]
Merge "Make _signal hidden in all cases."
am:
6a8a09f7c4
* commit '
6a8a09f7c40fb677a8dc8a233b58f62df8ae79dc':
Make _signal hidden in all cases.
Christopher Ferris [Sat, 31 Oct 2015 16:11:48 +0000 (16:11 +0000)]
Merge "Make _signal hidden in all cases."
Dmitriy Ivanov [Sat, 31 Oct 2015 00:43:27 +0000 (17:43 -0700)]
Generate libdl.so per-architecture version script
Bug: http://b/
24767418
Change-Id: I3d5775ba44d4c8e7fc5f2fbebae10e022100f1e2
Christopher Ferris [Sat, 31 Oct 2015 00:10:47 +0000 (17:10 -0700)]
Make _signal hidden in all cases.
_signal was static in 64 bit, and hidden on 32 bit. There is no
reason to have this distinction, so make it hidden in all cases.
Change-Id: I09d5d93ac8cab4fe14dc7bdfeb25aa46a3b7413d
Elliott Hughes [Fri, 30 Oct 2015 23:44:51 +0000 (23:44 +0000)]
Merge "Add prlimit to LP32." am:
c36be975ce
am:
a8f69017e5
* commit '
a8f69017e58ba07506abced624ed7cb6573c6291':
Add prlimit to LP32.
Elliott Hughes [Fri, 30 Oct 2015 23:40:48 +0000 (23:40 +0000)]
Merge "Add prlimit to LP32."
am:
c36be975ce
* commit '
c36be975ce4525b452435f43beb1fb9fc26a7fdc':
Add prlimit to LP32.
Elliott Hughes [Fri, 30 Oct 2015 23:35:40 +0000 (23:35 +0000)]
Merge "Add prlimit to LP32."
Elliott Hughes [Fri, 30 Oct 2015 22:25:32 +0000 (22:25 +0000)]
Merge "Remove <sys/shm.h>." am:
bdac9ec142
am:
caa61b03b2
* commit '
caa61b03b22cb015193d67ff33a0cb87effa9efc':
Remove <sys/shm.h>.
Elliott Hughes [Fri, 30 Oct 2015 22:16:58 +0000 (22:16 +0000)]
Merge "Remove <sys/shm.h>."
am:
bdac9ec142
* commit '
bdac9ec142347a0dc9784bddd0f8336535e73529':
Remove <sys/shm.h>.
Elliott Hughes [Fri, 30 Oct 2015 22:06:26 +0000 (22:06 +0000)]
Merge "Remove <sys/shm.h>."
Christopher Ferris [Fri, 30 Oct 2015 16:10:34 +0000 (16:10 +0000)]
Merge "Move __set_errno to ndk_cruft.cpp." am:
e75453d5dd
am:
6297e3231c
* commit '
6297e3231c4a449501de6e53b716db608ab4c5ea':
Move __set_errno to ndk_cruft.cpp.
Christopher Ferris [Fri, 30 Oct 2015 16:06:45 +0000 (16:06 +0000)]
Merge "Move __set_errno to ndk_cruft.cpp."
am:
e75453d5dd
* commit '
e75453d5dd8b373f6e7ef61ec22a6a3074d51e02':
Move __set_errno to ndk_cruft.cpp.
Christopher Ferris [Fri, 30 Oct 2015 16:02:01 +0000 (16:02 +0000)]
Merge "Move __set_errno to ndk_cruft.cpp."
OSDN Git Service
