Andrew Hsieh
048569be54
Rename __dso_handle_so.c to __dso_handle_so.h
...
Also chang libc/arch-arm/bionic/crtbegin_so.c to include it
as a header.
Change-Id: Ib91b0b8caf5c8b936425aa8a4fc1a229b2b27929
2012-09-07 12:49:41 +08:00
Ian Rogers
e9859df7cc
am 973bf681
: am 77039d34
: am e8f81547
: Merge "Fix build warning of initialization but no use."
...
* commit '973bf681b74d418704202cbfefef5d3be031b066':
Fix build warning of initialization but no use.
2012-09-06 11:52:24 -07:00
Ian Rogers
973bf681b7
am 77039d34
: am e8f81547
: Merge "Fix build warning of initialization but no use."
...
* commit '77039d34449e369b9425a36eaed38d41b9d20884':
Fix build warning of initialization but no use.
2012-09-06 11:50:22 -07:00
Ian Rogers
77039d3444
am e8f81547
: Merge "Fix build warning of initialization but no use."
...
* commit 'e8f815473ba463b875cea757bc0a52fc32f10748':
Fix build warning of initialization but no use.
2012-09-06 11:45:54 -07:00
Ian Rogers
e8f815473b
Merge "Fix build warning of initialization but no use."
2012-09-06 11:41:52 -07:00
Elliott Hughes
1ad05db9ce
Add mlockall and munlockall for Google TV.
...
Change-Id: I10e961d701e74aab07211ec7975f61167e387853
2012-09-06 11:24:45 -07:00
Elliott Hughes
684669dfd7
am de0dc251
: am 41ff8b98
: am 6e3b0f2d
: Merge "Don\'t corrupt the thread list in static executables."
...
* commit 'de0dc251120e03622d89d7af2ce44530d665e065':
Don't corrupt the thread list in static executables.
2012-09-06 10:46:41 -07:00
Elliott Hughes
de0dc25112
am 41ff8b98
: am 6e3b0f2d
: Merge "Don\'t corrupt the thread list in static executables."
...
* commit '41ff8b98044de19d6ea5228452c2d555c4224da7':
Don't corrupt the thread list in static executables.
2012-09-06 10:44:13 -07:00
Elliott Hughes
41ff8b9804
am 6e3b0f2d
: Merge "Don\'t corrupt the thread list in static executables."
...
* commit '6e3b0f2d2e89a8f3bbfc5d26dcdc13233c1111ba':
Don't corrupt the thread list in static executables.
2012-09-06 10:40:43 -07:00
Elliott Hughes
6e3b0f2d2e
Merge "Don't corrupt the thread list in static executables."
2012-09-06 10:31:52 -07:00
Ian Rogers
09f76cdd9b
Fix build warning of initialization but no use.
...
first_run is only used with LOCK_AT_FORK, however, care needs to be
taken with the #if to avoid compiler warnings when LOCK_AT_FORK isn't
being used.
Change-Id: I6bcfac2ab8732c91607f4a1bcd7c0019f29c2eec
2012-09-06 09:59:13 -07:00
The Android Open Source Project
c0ee117170
Reconcile with jb-mr1-release - do not merge
...
Change-Id: If42e786ae4ba616676fad3872f3c36f0c0be16f8
2012-09-06 07:52:32 -07:00
The Android Automerger
abce26b05a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-06 06:33:25 -07:00
Ajay Dudani
d58928e831
am 183d0a57
: Update msm_ion.h ioctls so they dont conflict with ion.h
...
* commit '183d0a57a292a33d92baa099b14425805a94306d':
Update msm_ion.h ioctls so they dont conflict with ion.h
2012-09-05 21:49:44 -07:00
Ajay Dudani
183d0a57a2
Update msm_ion.h ioctls so they dont conflict with ion.h
...
Change-Id: Ib6ffcc147e39b3f9f2eb9a8ed403b74d99bc755f
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-05 21:47:32 -07:00
Ajay Dudani
bf3da78e69
am 85811fc7
: Revert "msm_ion: switch to using legacy_ion.h"
...
* commit '85811fc7c244c977186cff501063d5f67fb5352b':
Revert "msm_ion: switch to using legacy_ion.h"
2012-09-05 21:45:39 -07:00
Ajay Dudani
7649d62255
am dc81b447
: Revert "add legacy_ion.h"
...
* commit 'dc81b44759b30a7fe0951d35f658700afd806bea':
Revert "add legacy_ion.h"
2012-09-05 21:44:13 -07:00
Ajay Dudani
85811fc7c2
Revert "msm_ion: switch to using legacy_ion.h"
...
This reverts commit 66edcd9dad
.
2012-09-05 21:43:15 -07:00
Ajay Dudani
dc81b44759
Revert "add legacy_ion.h"
...
This reverts commit 5f1d206de3
.
2012-09-05 21:42:10 -07:00
Elliott Hughes
bfeab1bbe7
Don't corrupt the thread list in static executables.
...
Several previous changes conspired to make a mess of the thread list
in static binaries. This was most obvious when trying to call
pthread_key_delete(3) on the main thread.
Bug: http://code.google.com/p/android/issues/detail?id=36893
Change-Id: I2a2f553114d8fb40533c481252b410c10656da2e
2012-09-05 17:47:37 -07:00
Elliott Hughes
8140487f60
am 2da90705
: am 008f4df5
: am ff4608ae
: Merge "Add missing dependencies."
...
* commit '2da907059e187ffdcc25b15af91f912eecdcf776':
Add missing dependencies.
2012-09-05 14:57:27 -07:00
Elliott Hughes
2da907059e
am 008f4df5
: am ff4608ae
: Merge "Add missing dependencies."
...
* commit '008f4df5ba52ff502651da957ad8dbe149ff2ed6':
Add missing dependencies.
2012-09-05 14:55:45 -07:00
Elliott Hughes
008f4df5ba
am ff4608ae
: Merge "Add missing dependencies."
...
* commit 'ff4608ae0cb78caa05b83e109fc2633682958089':
Add missing dependencies.
2012-09-05 14:51:30 -07:00
Elliott Hughes
ff4608ae0c
Merge "Add missing dependencies."
2012-09-05 14:46:15 -07:00
Elliott Hughes
2e8f4345df
Add missing dependencies.
...
Change-Id: I53c1cfb59ac7a89952a8d6b906b2b9e16a66624f
2012-09-05 14:27:17 -07:00
Elliott Hughes
d5b14e3552
am faf361a6
: am 2fc3e1ef
: am b2c5bd54
: Merge "ARM: warn about atexit() calls from legacy shared libraries"
...
* commit 'faf361a6ac23af030268728f6eb02a3d1080a5ff':
ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:34:23 -07:00
Elliott Hughes
faf361a6ac
am 2fc3e1ef
: am b2c5bd54
: Merge "ARM: warn about atexit() calls from legacy shared libraries"
...
* commit '2fc3e1efda003d9eb110c3fc08bb32f29c6e8a4b':
ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:32:25 -07:00
Elliott Hughes
2fc3e1efda
am b2c5bd54
: Merge "ARM: warn about atexit() calls from legacy shared libraries"
...
* commit 'b2c5bd543dcbbc1b2cbf7afd8b124256ce2c128e':
ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:29:23 -07:00
Elliott Hughes
b2c5bd543d
Merge "ARM: warn about atexit() calls from legacy shared libraries"
2012-09-05 10:18:43 -07:00
Elliott Hughes
340ff83f98
am ac3e35cd
: am a76f2eca
: am 26f2e4a1
: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
...
* commit 'ac3e35cd8f1ba8133905ee3700e092efef98ab12':
ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 10:03:37 -07:00
Elliott Hughes
ac3e35cd8f
am a76f2eca
: am 26f2e4a1
: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
...
* commit 'a76f2ecaa203bd8b5cc2ca157f06c0d2de66a52f':
ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 10:01:48 -07:00
Elliott Hughes
a76f2ecaa2
am 26f2e4a1
: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
...
* commit '26f2e4a1639a959513c4ff5981b4eb52757e8012':
ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 09:57:15 -07:00
Elliott Hughes
26f2e4a163
Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
2012-09-05 09:43:35 -07:00
Ian Rogers
64f4e71418
am f71d757f
: am 7310a1c4
: am 82978cae
: Merge "Avoid malloc lock while calling pthread_atfork."
...
* commit 'f71d757f6eea0394654b5c07a580bf3b4d048853':
Avoid malloc lock while calling pthread_atfork.
2012-09-05 07:54:35 -07:00
Ian Rogers
f71d757f6e
am 7310a1c4
: am 82978cae
: Merge "Avoid malloc lock while calling pthread_atfork."
...
* commit '7310a1c4326bc875aeea2ce091a4b6558d183b2d':
Avoid malloc lock while calling pthread_atfork.
2012-09-05 07:52:12 -07:00
Ian Rogers
7310a1c432
am 82978cae
: Merge "Avoid malloc lock while calling pthread_atfork."
...
* commit '82978cae4eec238a9d631d2b61b8985daa02516e':
Avoid malloc lock while calling pthread_atfork.
2012-09-05 07:48:14 -07:00
Ian Rogers
82978cae4e
Merge "Avoid malloc lock while calling pthread_atfork."
2012-09-05 07:41:32 -07:00
The Android Automerger
3a8807df34
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-05 06:33:22 -07:00
Elliott Hughes
9deb460a26
am ab558163
: am b9f0a6eb
: am be19a367
: Merge "termios: add tcdrain"
...
* commit 'ab558163a3f79834d4aa3107f4fed20bb242860b':
termios: add tcdrain
2012-09-04 18:15:48 -07:00
Elliott Hughes
ab558163a3
am b9f0a6eb
: am be19a367
: Merge "termios: add tcdrain"
...
* commit 'b9f0a6eb75aa8f1eec95fb5718d84cef1d0f61b8':
termios: add tcdrain
2012-09-04 18:13:50 -07:00
Elliott Hughes
b9f0a6eb75
am be19a367
: Merge "termios: add tcdrain"
...
* commit 'be19a3671709879ccc0156b94f7ef7540027dc37':
termios: add tcdrain
2012-09-04 18:10:07 -07:00
Elliott Hughes
be19a36717
Merge "termios: add tcdrain"
2012-09-04 17:52:40 -07:00
Elliott Hughes
fe7ac11afa
am f34c6d77
: am bc374078
: am 5ff23471
: Merge "Add getsid system call to bionic"
...
* commit 'f34c6d7796102cf33bd8887efd0ba3f70884acd9':
Add getsid system call to bionic
2012-09-04 16:49:27 -07:00
Elliott Hughes
f34c6d7796
am bc374078
: am 5ff23471
: Merge "Add getsid system call to bionic"
...
* commit 'bc3740787ac4108c2e0e247bc7ca2ea66329c5ab':
Add getsid system call to bionic
2012-09-04 16:47:44 -07:00
Elliott Hughes
bc3740787a
am 5ff23471
: Merge "Add getsid system call to bionic"
...
* commit '5ff23471303a1b99ddc1e1751662aa45f34b5e21':
Add getsid system call to bionic
2012-09-04 16:44:54 -07:00
Elliott Hughes
5ff2347130
Merge "Add getsid system call to bionic"
2012-09-04 16:36:27 -07:00
Elliott Hughes
ad639c1d2b
am 877ad30f
: am 507bcabb
: am e03ab936
: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
...
* commit '877ad30fd6e8745b43063947a9220d1f1398ee02':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
2012-09-04 16:03:30 -07:00
Elliott Hughes
877ad30fd6
am 507bcabb
: am e03ab936
: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
...
* commit '507bcabb3565d20541242ad61f987bc1a6483ba1':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
2012-09-04 16:00:20 -07:00
Elliott Hughes
507bcabb35
am e03ab936
: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
...
* commit 'e03ab936996a1a46d461cdad463d7f5bca10b051':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
2012-09-04 15:56:12 -07:00
Elliott Hughes
e03ab93699
Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
2012-09-04 15:51:55 -07:00