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
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
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
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
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
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
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
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
Jin Wei
22d366cc09
enable clone system call for x86
...
Add __bionic_clone function for x86, which will be
used for clone system call.
Change-Id: I889dc9bf4b7ebb4358476e17e6f3233e26491f4d
Signed-off-by: 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>
Author-tracking-BZ: 51414
2012-08-15 17:04:50 -07:00
Elliott Hughes
0681b2e477
am f53c75e5
: am 2e3756b4
: am 9b3bbcda
: am fe43c768
: Merge "Switch to the current NetBSD regex implementation."
...
* commit 'f53c75e513cb088d712badc32b89a8792a329d63':
Switch to the current NetBSD regex implementation.
2012-08-15 16:03:03 -07:00
Elliott Hughes
2e3756b4d3
am 9b3bbcda
: am fe43c768
: Merge "Switch to the current NetBSD regex implementation."
...
* commit '9b3bbcda8478a31fa2c3865e0bd8cb3011dfc26e':
Switch to the current NetBSD regex implementation.
2012-08-15 15:59:44 -07:00
Elliott Hughes
cc213f871b
Switch to the current NetBSD regex implementation.
...
Change-Id: If32b28dd85d6a7ab8957ab81d19fa4c0de9499d5
2012-08-15 15:39:11 -07:00
Elliott Hughes
cc9f4d56c0
am ff45d5cd
: am 82259117
: am 008a0a5d
: am 53493a9b
: Merge "Sort NOTICE entries."
...
* commit 'ff45d5cdbfc4117d69fc688f12ec251297eb8751':
Sort NOTICE entries.
2012-08-14 15:47:31 -07:00
Elliott Hughes
8225911775
am 008a0a5d
: am 53493a9b
: Merge "Sort NOTICE entries."
...
* commit '008a0a5d50965f73d5954607a0b17b95a7f1fd0e':
Sort NOTICE entries.
2012-08-14 15:43:57 -07:00
Iliyan Malchev
422bb8b5c4
am 912dd712
: am df88d88f
: Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
...
* commit '912dd71259959a259478465296438e83d0ad8e64':
update msm_mdp.h header to support vsync
update processed msm_camera.h and msm_isp.h
2012-08-14 15:43:18 -07:00
Elliott Hughes
261e2232c1
Sort NOTICE entries.
...
Also make sure we get the whole of any copyright header, in case
there's text before the "Copyright" line.
Change-Id: Iabcc5e0931a39c0107b833539fec7c5a3d134592
2012-08-14 15:04:05 -07:00
Naseer Ahmed
056b4bc499
update msm_mdp.h header to support vsync
...
Change-Id: I2e8af44e430ff4955615d166bd25d7a2102ccc0f
2012-08-14 12:51:42 -07:00
Ajay Dudani
77b25702ba
update processed msm_camera.h and msm_isp.h
...
Change-Id: Ie9250a0ef888a2d1ba0b736b19fede369daeef84
2012-08-14 12:51:42 -07:00
Elliott Hughes
a10b277de2
am bfcd5525
: am b6d6ec53
: am 370a7094
: am c50e0197
: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit 'bfcd55250058e927e0c6d0b94337c89fc2d86fa2':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:21:20 -07:00
Elliott Hughes
b6d6ec5326
am 370a7094
: am c50e0197
: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit '370a70948ad56046f685ffda34ead8ae88dcad2a':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:14:12 -07:00
Jeff Sharkey
0febe091a5
am 21f7ef9e
: am d8450043
: Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
...
* commit '21f7ef9eb269f75d7c291b4c574eabc865bf4362':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:11:01 -07:00
Jeff Sharkey
74c0464006
Update MS_ mount flags, define unshare() syscall.
...
(cherry-pick of 82393decdfc6b0383054fb5d2f54725bbee88b8c.)
Bug: 6925012
Change-Id: I4f962d8975ad62ff4b9983150f9e481796092b9d
2012-08-14 12:09:25 -07:00
Jeff Sharkey
d8450043b0
Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
2012-08-14 12:05:46 -07:00
Jeff Sharkey
82393decdf
Update MS_ mount flags, define unshare() syscall.
...
Bug: 6925012
Change-Id: I4ad79b4bccb7737d4dc704476cdb5795d124f53e
2012-08-14 11:45:12 -07:00
Elliott Hughes
409302f0f9
Switch to upstream NetBSD tdelete/tfind/tsearch.
...
tdestroy is a GNU extension, so that stays.
Change-Id: Iedebaff25ea7e92b1ab1dd4440da12b67b99aa40
2012-08-13 17:41:49 -07:00
Elliott Hughes
d52075bd97
am 2bc1cade
: am 93a9d534
: am d544bdfa
: am 54655eaf
: Merge "Fix nice..."
...
* commit '2bc1cadeff4b7d41c889b8f1b965028ec575bed6':
Fix nice...
2012-08-13 17:16:55 -07:00
Elliott Hughes
93a9d53485
am d544bdfa
: am 54655eaf
: Merge "Fix nice..."
...
* commit 'd544bdfac8da8aa7052aab47468acb3baf8e461a':
Fix nice...
2012-08-13 17:14:40 -07:00
Elliott Hughes
3d2d448af1
Fix nice...
...
...by switching to the NetBSD implementation.
Change-Id: I562b27b237a24ded95804035cc322c7bff12ff59
2012-08-13 16:38:29 -07:00
Elliott Hughes
50b4523380
am aa29740c
: am 69fc1522
: am aa6c8994
: am b66bc514
: Merge "Clean up warnings in stubs.cpp."
...
* commit 'aa29740ce252113071f96872b7b99c8528bd1637':
Clean up warnings in stubs.cpp.
2012-08-13 16:28:44 -07:00
Elliott Hughes
69fc1522a3
am aa6c8994
: am b66bc514
: Merge "Clean up warnings in stubs.cpp."
...
* commit 'aa6c8994b7c40ea637d60fa4413928e62b5d814a':
Clean up warnings in stubs.cpp.
2012-08-13 16:24:38 -07:00
Elliott Hughes
66c033868f
am c64c1b49
: am ad8ff472
: am c1eb7619
: am 440e417d
: Merge "Add dependencies on all the makefiles."
...
* commit 'c64c1b49fd5c51b1b6e87d88b233d23fa172d372':
Add dependencies on all the makefiles.
2012-08-13 16:10:31 -07:00
Elliott Hughes
4a5ab7a191
am 141a3b10
: am cfd0345f
: am 35dcf19b
: am 66fba009
: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
...
* commit '141a3b109c32acb0d7279ea85706db781bfc0594':
Update arch-mips/asm/unistd.h for the newer syscalls
2012-08-13 16:10:30 -07:00
Elliott Hughes
de727caee2
Clean up warnings in stubs.cpp.
...
Switch to C++ to get extra warnings, and format the code Google style.
Change-Id: Ifc0131bf297a6ee8a8a6b8d049a02518b0b1a4b7
2012-08-13 16:10:19 -07:00
Elliott Hughes
ad8ff472b6
am c1eb7619
: am 440e417d
: Merge "Add dependencies on all the makefiles."
...
* commit 'c1eb76198ec81802f69b52a8c6fbf97765d46f53':
Add dependencies on all the makefiles.
2012-08-13 16:03:26 -07:00
Elliott Hughes
cfd0345fe0
am 35dcf19b
: am 66fba009
: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
...
* commit '35dcf19b2bcf388cda7f4c9baacb159c15c9b03f':
Update arch-mips/asm/unistd.h for the newer syscalls
2012-08-13 16:03:16 -07:00
Amith Yamasani
bf9441efb8
Handle naming for system uids running as secondary users
...
Allow naming such as u1_system, u2_radio, u2_media.
Forward and reverse mapping for the above.
(cherry-pick of c60a0027b1ef3bc4929d2023e7083fbce12fafe7.)
Change-Id: I46eeb23fee4f57b2907640570504123d3ce99985
2012-08-13 14:19:16 -07:00
Elliott Hughes
ae5c64413b
Add dependencies on all the makefiles.
...
This should help prevent broken builds next time I'm messing with
assembler/compiler/linker flags...
Change-Id: I30f15a3ce3c3f3c60cad7bc59aaba9f42d792224
2012-08-13 14:06:05 -07:00
Amith Yamasani
79f3698f39
am c6c26a08
: am ca7ee8a9
: Merge "Handle naming for system uids running as secondary users" into jb-mr1-dev
...
* commit 'c6c26a08c8ffd431824e13c40328c35394fb4148':
Handle naming for system uids running as secondary users
2012-08-13 13:53:55 -07:00
Amith Yamasani
c60a0027b1
Handle naming for system uids running as secondary users
...
Allow naming such as u1_system, u2_radio, u2_media.
Forward and reverse mapping for the above.
Change-Id: Iebe6e5702fc1ed83aa67769a12f693c1be7968ed
2012-08-13 13:35:31 -07:00
Raghu Gandham
7d9f1c46bb
Update arch-mips/asm/unistd.h for the newer syscalls
...
Change-Id: Ie292c091cbf4b972e1b5faa7d779645c6e4442f0
2012-08-13 11:54:53 -07:00
Elliott Hughes
259f4a1503
am 7261264c
: am 2a22a69e
: am 877dc946
: am 072a7e6c
: Merge "MIPS support to the libc Makefile"
...
* commit '7261264c3a336bfb6e52241c2ba80679cbba68c8':
MIPS support to the libc Makefile
2012-08-11 15:19:34 -07:00
Elliott Hughes
2a22a69e94
am 877dc946
: am 072a7e6c
: Merge "MIPS support to the libc Makefile"
...
* commit '877dc946090749ba7a71f7ae07f51aa32f966083':
MIPS support to the libc Makefile
2012-08-11 15:16:34 -07:00
Ying Wang
c97c5fc788
Split out LOCAL_ASFLAGS.
...
Bug: 6967574
Change-Id: I5be50d582c1cb8075039b06292cf0745a996c3c4
2012-08-11 14:23:19 -07:00
Raghu Gandham
a4c7933b49
MIPS support to the libc Makefile
...
Change-Id: Ia1f3f545ca61a5abb235e99046cb3cdaf24d4205
2012-08-10 17:24:02 -07:00
Elliott Hughes
0837c69a63
am edf09bf9
: am 316ee626
: Merge "MIPS support to sigsuspend and sigwait routines"
...
* commit 'edf09bf990c8b011a084dbdb92050879e08ad8a9':
MIPS support to sigsuspend and sigwait routines
2012-08-10 15:17:05 -07:00
Elliott Hughes
316ee626b7
Merge "MIPS support to sigsuspend and sigwait routines"
2012-08-10 15:05:36 -07:00
Nick Kralevich
73d99958bb
am fabeb736
: am 38a02b4b
: Merge "crtend*: Add GNU_STACK note"
...
* commit 'fabeb736e91d4f4f79a1cbbed696cffb50a860a9':
crtend*: Add GNU_STACK note
2012-08-10 14:46:56 -07:00