Commit Graph

2877 Commits

Author SHA1 Message Date
Elliott Hughes
b3cbcb3547 am 5804b88a: am b0102454: am 7c7a7f8e: am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
* commit '5804b88a44c153fa1b39dd3095be9e905d77cee0':
  Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-10 17:05:15 -07:00
Elliott Hughes
b35a90d682 am ffcb92e7: am b18d4f63: am 72fcdbe9: am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
* commit 'ffcb92e779b347b3725e560aa3aabd122a4dbd62':
  Add mlockall and munlockall for Google TV.
2012-09-10 17:05:14 -07:00
Elliott Hughes
5804b88a44 am b0102454: am 7c7a7f8e: am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
* commit 'b010245490f50601b13ee17238e31162b6143d71':
  Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:11:35 -07:00
Elliott Hughes
ffcb92e779 am b18d4f63: am 72fcdbe9: am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
* commit 'b18d4f6361c4ae011c7661da46ad0501eecba591':
  Add mlockall and munlockall for Google TV.
2012-09-07 11:11:34 -07:00
Elliott Hughes
b010245490 am 7c7a7f8e: am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
* commit '7c7a7f8e526518f37eae3ce2a785344316f263e0':
  Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:09:23 -07:00
Elliott Hughes
b18d4f6361 am 72fcdbe9: am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
* commit '72fcdbe9025b0405251c17eb391f326e03bf92ef':
  Add mlockall and munlockall for Google TV.
2012-09-07 11:09:23 -07:00
Elliott Hughes
7c7a7f8e52 am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
* commit 'd10309c36b93176a473baeeddef6f3fba8bf0678':
  Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:07:13 -07:00
Elliott Hughes
72fcdbe902 am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
* commit '691ef3c80b4af278aa90d6e005ba42de1e52c140':
  Add mlockall and munlockall for Google TV.
2012-09-07 11:07:10 -07:00
Elliott Hughes
d10309c36b Merge "Rename __dso_handle_so.c to __dso_handle_so.h" 2012-09-07 10:59:20 -07:00
Elliott Hughes
691ef3c80b Merge "Add mlockall and munlockall for Google TV." 2012-09-07 10:51:49 -07:00
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
593315c327 am e9859df7: am 973bf681: am 77039d34: am e8f81547: Merge "Fix build warning of initialization but no use."
* commit 'e9859df7cc57f761a4b9457b4d55ecff33bfdc8b':
  Fix build warning of initialization but no use.
2012-09-06 11:54:48 -07: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
f28d8d7042 am 684669df: am de0dc251: am 41ff8b98: am 6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
* commit '684669dfd7fdefa1e0f45e91667af628d3742429':
  Don't corrupt the thread list in static executables.
2012-09-06 10:48:52 -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
c99828169b am c0ee1171: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c0ee117170e9a8976ffd2afc99bce8f1242cefd1':
  Revert "Update ion header"
  :Revert "Update ion header"
2012-09-06 09:12:34 -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
58deb845c5 am d58928e8: am 183d0a57: Update msm_ion.h ioctls so they dont conflict with ion.h
* commit 'd58928e83109aeac42e2226de3ec99a91e59a695':
  Update msm_ion.h ioctls so they dont conflict with ion.h
2012-09-05 21:52:04 -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
1c24c54840 am bf3da78e: am 85811fc7: Revert "msm_ion: switch to using legacy_ion.h"
* commit 'bf3da78e690524414a8874313638f7cf33b44424':
  Revert "msm_ion: switch to using legacy_ion.h"
2012-09-05 21:47:56 -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
457e60a2f8 am 7649d622: am dc81b447: Revert "add legacy_ion.h"
* commit '7649d62255f056d1520cd746ddcd6352d091f76f':
  Revert "add legacy_ion.h"
2012-09-05 21:46:33 -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
bc30d0a798 am 8140487f: am 2da90705: am 008f4df5: am ff4608ae: Merge "Add missing dependencies."
* commit '8140487f6014f83c14cecb6ecb9535bd4966a13e':
  Add missing dependencies.
2012-09-05 15:22:28 -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
db18cbdd85 am d5b14e35: am faf361a6: am 2fc3e1ef: am b2c5bd54: Merge "ARM: warn about atexit() calls from legacy shared libraries"
* commit 'd5b14e35521ee6a038714c42ec523dcfe183b65b':
  ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:36:09 -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
ec0d2a86b7 am 340ff83f: am ac3e35cd: am a76f2eca: am 26f2e4a1: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
* commit '340ff83f9878a478cfa4b5aaaf4260f96304c416':
  ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 10:06:25 -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