Elliott Hughes
230df050ed
am ea5dea8e
: am db2903fa
: am cbeccc84
: am 200de748
: Merge "Fix race condition in pthread_create()"
...
* commit 'ea5dea8edb4217da7798ef29759c2b5d27f7dcfb':
Fix race condition in pthread_create()
2012-08-17 16:30:02 -07:00
Elliott Hughes
ea5dea8edb
am db2903fa
: am cbeccc84
: am 200de748
: Merge "Fix race condition in pthread_create()"
...
* commit 'db2903fac3d4548de1fd0fda1d3b7460c723282e':
Fix race condition in pthread_create()
2012-08-17 16:28:00 -07:00
Elliott Hughes
db2903fac3
am cbeccc84
: am 200de748
: Merge "Fix race condition in pthread_create()"
...
* commit 'cbeccc849a45ac9adc124a6d1781c1ddc7bad54e':
Fix race condition in pthread_create()
2012-08-17 16:26:37 -07:00
Elliott Hughes
cbeccc849a
am 200de748
: Merge "Fix race condition in pthread_create()"
...
* commit '200de748b91d7638a2c434584abcb3840704494b':
Fix race condition in pthread_create()
2012-08-17 16:23:53 -07:00
Elliott Hughes
200de748b9
Merge "Fix race condition in pthread_create()"
2012-08-17 16:19:56 -07:00
Jurijs Oniscuks
2932f04832
Fix race condition in pthread_create()
...
Save thread id to *thread_out before new
thread is allowed to run else there's a
risk that the thread has finished and
been deleted when *thread_out is assigned.
Change-Id: I6b84c61a8df06840877d4ab036f26feace3192d8
2012-08-17 16:18:32 -07:00
Elliott Hughes
1f6639a1bf
am d060b824
: am efd39834
: am e5242bfd
: am 1771a33d
: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit 'd060b824dd293bf1ecd7814cd2e75a77186cefcb':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:04:52 -07:00
Elliott Hughes
d060b824dd
am efd39834
: am e5242bfd
: am 1771a33d
: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit 'efd3983446c6574c9662b01f441776cf299c0c80':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:03:53 -07:00
Elliott Hughes
efd3983446
am e5242bfd
: am 1771a33d
: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit 'e5242bfdd731a67282389ece515f094d57bb7300':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:01:53 -07:00
Elliott Hughes
e5242bfdd7
am 1771a33d
: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit '1771a33d11a24f1c47b1ef75e3726c5d9e751f5b':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:00:11 -07:00
Elliott Hughes
1771a33d11
Merge "Add link.h for all platforms with dl_phdr_info"
2012-08-17 13:54:43 -07:00
Pavel Chupin
b7beb69075
Add link.h for all platforms with dl_phdr_info
...
This header is used on bionic build and should be propagated into
sysroot on toolchain rebuild. Discussion re. this header is here:
http://gcc.gnu.org/ml/gcc-patches/2012-08/msg00936.html
It is available already in mips NDK platforms:
development/ndk/platforms/android-9/arch-mips/include/link.h
Change-Id: I39ff467cdac9f448e31c11ee3e14a6200e82ab57
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-08-17 12:44:23 -07:00
Joe Onorato
342e174b24
am 947f2e61
: am 28ae6f5d
: am cefb93b6
: am 6c98cdb1
: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
...
* commit '947f2e610a89931b20a4ddd678e89df12c76e058':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
2012-08-17 00:18:26 -07:00
Joe Onorato
947f2e610a
am 28ae6f5d
: am cefb93b6
: am 6c98cdb1
: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
...
* commit '28ae6f5dfd024dd3f860b134ebed56a0248a1097':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
2012-08-17 00:14:21 -07:00
Joe Onorato
28ae6f5dfd
am cefb93b6
: am 6c98cdb1
: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
...
* commit 'cefb93b632fc5a65bf7620095155cc1c314e29f2':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
2012-08-17 00:11:56 -07:00
Joe Onorato
cefb93b632
am 6c98cdb1
: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
...
* commit '6c98cdb1924afd3e71d39904557933fa10adaebf':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
2012-08-16 23:50:35 -07:00
Joe Onorato
6c98cdb192
Merge "Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds."
2012-08-16 23:37:50 -07:00
Joe Onorato
7b841f3b4a
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
...
Change-Id: I5821ced7a8a9042fd2094204e07470d8002263ca
2012-08-16 22:36:36 -07:00
The Android Open Source Project
cd6fd2f14d
am 89a4090e
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '89a4090ecae61053e3ac6c9b96a8ee469495cf01':
2012-08-16 19:11:21 -07:00
The Android Open Source Project
89a4090eca
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I56a0568d05e01d6ca908c97af3036ffe5a057df0
2012-08-16 19:09:40 -07:00
Elliott Hughes
4b027b381f
am 12911624
: am a7d8f3d5
: am c80ca54f
: am 60ef95e1
: Merge "Enhance getcwd(3) to handle NULL like glibc."
...
* commit '129116241022d51ca915ef1d6b94d131a3f5569f':
Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:09:35 -07:00
Elliott Hughes
1291162410
am a7d8f3d5
: am c80ca54f
: am 60ef95e1
: Merge "Enhance getcwd(3) to handle NULL like glibc."
...
* commit 'a7d8f3d50e6b0858b3b6494d772167286cdeb986':
Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:07:18 -07:00
Elliott Hughes
a7d8f3d50e
am c80ca54f
: am 60ef95e1
: Merge "Enhance getcwd(3) to handle NULL like glibc."
...
* commit 'c80ca54f3cd2d7e20770e286f4478fb589742478':
Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:05:40 -07:00
Elliott Hughes
c80ca54f3c
am 60ef95e1
: Merge "Enhance getcwd(3) to handle NULL like glibc."
...
* commit '60ef95e1c1b171635adb4d11289347674b1b8987':
Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:04:11 -07:00
Elliott Hughes
60ef95e1c1
Merge "Enhance getcwd(3) to handle NULL like glibc."
2012-08-16 16:58:34 -07:00
Elliott Hughes
04a83a48ed
Enhance getcwd(3) to handle NULL like glibc.
...
Bug: http://code.google.com/p/android/issues/detail?id=36085
Change-Id: I960a1b585887eb66176c61d29c5c61c239a4003f
2012-08-16 15:59:12 -07:00
Elliott Hughes
0a14d9f5c8
am ca82e1f3
: am 820ad428
: am 74438bb2
: am 449d4634
: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit 'ca82e1f3d17b57b1d5bbf0527cae58be1861e9ae':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 14:28:52 -07:00
Elliott Hughes
ca82e1f3d1
am 820ad428
: am 74438bb2
: am 449d4634
: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit '820ad4283d71c4f2303f80d8ccbe6c90a6ec5407':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 14:27:28 -07:00
Elliott Hughes
820ad4283d
am 74438bb2
: am 449d4634
: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit '74438bb22505b55ec72224932ae9982fbf9b4b65':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 14:23:56 -07:00
Elliott Hughes
74438bb225
am 449d4634
: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit '449d4634bea0ff8f6b29a2826871279dd654f941':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 12:27:47 -07:00
Elliott Hughes
449d4634be
Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
2012-08-16 12:09:13 -07:00
Jin Wei
9862f5e08b
bionic: add macro protection for MALLOC_ALIGNMENT
...
In previous commit: 2fd81ef7
, .mk file has been modified to
configure MALLOC_ALIGNMENT dynamicly according to board config.
Add the missing macor protection here.
Change-Id: I703cca2ce0504ab3e11aab226b2c61fcc0c6afa1
Author: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
2012-08-16 12:08:36 -07:00
Scott Anderson
4628d2f6bb
am cc8165ae
: am 09d9dd3a
: Merge "Add clean kernel header for uhid." into jb-mr1-dev
...
* commit 'cc8165aea50294c6a86ad456967a7a741ac85a65':
Add clean kernel header for uhid.
2012-08-16 12:07:53 -07:00
Scott Anderson
cc8165aea5
am 09d9dd3a
: Merge "Add clean kernel header for uhid." into jb-mr1-dev
...
* commit '09d9dd3acdf74630eb7eb6896007e803085f45c6':
Add clean kernel header for uhid.
2012-08-16 12:05:44 -07:00
Scott Anderson
09d9dd3acd
Merge "Add clean kernel header for uhid." into jb-mr1-dev
2012-08-16 12:03:25 -07:00
Scott Anderson
52bf2d5659
Add clean kernel header for uhid.
...
The original kernel header was submitted in this change:
commit 45b515c106161bb3b00d2c097504b9d44505f2d9
Author: Scott Anderson <saa@android.com>
Date: Wed Aug 15 14:52:27 2012 -0700
Add uhid original header.
This header was cherry-picked from the upstream series that ends
with patch adefb69b1b94df29ea2df05cd838c0e032b2c473.
Change-Id: If516e41b6b14754e7feebdf062461dd38a31900a
Signed-off-by: Scott Anderson <saa@android.com>
Change-Id: I088a0df4449df859835f8267d0d2e6cd4ed3c478
Signed-off-by: Scott Anderson <saa@android.com>
2012-08-16 11:56:11 -07:00
The Android Automerger
e20afb140c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-16 06:33:16 -07:00
Elliott Hughes
26145cfc18
am 949d6faa
: am a626bbdb
: am 4af9141c
: am ae728099
: Merge "enable clone system call for x86"
...
* commit '949d6faa96e25170293d2a9ebe6f76cc91b77a6e':
enable clone system call for x86
2012-08-15 17:26:44 -07:00
Elliott Hughes
949d6faa96
am a626bbdb
: am 4af9141c
: am ae728099
: Merge "enable clone system call for x86"
...
* commit 'a626bbdb361539d6667932027ea9ffa26ef1faf4':
enable clone system call for x86
2012-08-15 17:25:35 -07:00
Elliott Hughes
a626bbdb36
am 4af9141c
: am ae728099
: Merge "enable clone system call for x86"
...
* commit '4af9141c5cc0989df6a1efcb10b2cfd484f2d9d2':
enable clone system call for x86
2012-08-15 17:24:21 -07:00
Elliott Hughes
4af9141c5c
am ae728099
: Merge "enable clone system call for x86"
...
* commit 'ae7280994e7845037b667fd6ebdcb6f299ba1aab':
enable clone system call for x86
2012-08-15 17:22:50 -07:00
Elliott Hughes
1d16b89289
am 31041a01
: am 29af938c
: am ab8850f7
: am 07cd1125
: Merge "Fix comment typos."
...
* commit '31041a0138d62879257d6980abd1e006c299752b':
Fix comment typos.
2012-08-15 17:11:48 -07:00
Elliott Hughes
b8d2695c82
am cdbd3406
: am 4d63f33c
: am 76aad1d2
: am e1cd69a7
: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit 'cdbd3406f51d7f21326fe99df21e48a9191dddc1':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:11:47 -07:00
Elliott Hughes
31041a0138
am 29af938c
: am ab8850f7
: am 07cd1125
: Merge "Fix comment typos."
...
* commit '29af938cbd9b898c92f44c022dc7f5d3ab9782a7':
Fix comment typos.
2012-08-15 17:09:39 -07:00
Elliott Hughes
cdbd3406f5
am 4d63f33c
: am 76aad1d2
: am e1cd69a7
: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit '4d63f33cdc74c340c13b96143833f669835764f2':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:09:38 -07:00
Elliott Hughes
29af938cbd
am ab8850f7
: am 07cd1125
: Merge "Fix comment typos."
...
* commit 'ab8850f7e2b79914af4cf83816e9a263b9e6dec3':
Fix comment typos.
2012-08-15 17:08:01 -07:00
Elliott Hughes
4d63f33cdc
am 76aad1d2
: am e1cd69a7
: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit '76aad1d2746f62aaaacdf717b4f51fa45560521d':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:07:59 -07:00
Elliott Hughes
ab8850f7e2
am 07cd1125
: Merge "Fix comment typos."
...
* commit '07cd11251f52ff8a8a98dba795f69aaa75199473':
Fix comment typos.
2012-08-15 17:06:53 -07:00
Elliott Hughes
76aad1d274
am e1cd69a7
: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit 'e1cd69a708d30fbc3b9e0e8d4db67f67fc123b65':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:06:51 -07:00
Elliott Hughes
ae7280994e
Merge "enable clone system call for x86"
2012-08-15 17:05:47 -07:00