Elliott Hughes
f6922be2a5
am f91e2f72
: Merge "Fix typo in SIGTTOU description."
...
* commit 'f91e2f72861643e1d31ffc3e6c374b52d33d2423':
Fix typo in SIGTTOU description.
2012-08-10 12:34:17 -07:00
Elliott Hughes
f91e2f7286
Merge "Fix typo in SIGTTOU description."
2012-08-10 12:27:06 -07:00
Elliott Hughes
01030e6388
Fix typo in SIGTTOU description.
...
Change-Id: Ie0db3e7df3e1f17b43f5645d027a90603139be2f
2012-08-10 12:23:58 -07:00
Elliott Hughes
a618ea30e1
am 4ec9e343
: Merge "Revert "Switch to NetBSD\'s strxfrm(3).""
...
* commit '4ec9e343cf445c5032d9a782d2e92b1dba713e61':
Revert "Switch to NetBSD's strxfrm(3)."
2012-08-10 11:44:29 -07:00
Elliott Hughes
4ec9e343cf
Merge "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 11:36:31 -07:00
Elliott Hughes
8793e7c7d2
Revert "Switch to NetBSD's strxfrm(3)."
...
This reverts commit be1d78b0dc
Change-Id: I11a95db474796f3da004f27652b081d5ba4ec9b4
2012-08-10 11:36:17 -07:00
Elliott Hughes
3e83da435b
am 9ad1d6f5
: Merge "Switch to NetBSD\'s strxfrm(3)."
...
* commit '9ad1d6f58ccbc830ce87e3ddf35708e519a8f23e':
Switch to NetBSD's strxfrm(3).
2012-08-10 11:28:40 -07:00
Elliott Hughes
9ad1d6f58c
Merge "Switch to NetBSD's strxfrm(3)."
2012-08-10 11:23:30 -07:00
Elliott Hughes
be1d78b0dc
Switch to NetBSD's strxfrm(3).
...
There were two bugs in our implementation. Intel found one, but another
remainined, and tracking upstream is the way forward for functions where
we add no value.
Change-Id: Ida9bac0293fb2c4cbc942b1e0515ee0477c6538b
2012-08-10 11:03:02 -07:00
Elliott Hughes
dc6d5327bb
am 0836a7ff
: Merge "Auto-generate a complete NOTICE file."
...
* commit '0836a7ffb13890558fe568119b023007cce66373':
Auto-generate a complete NOTICE file.
2012-08-09 16:39:15 -07:00
Elliott Hughes
0836a7ffb1
Merge "Auto-generate a complete NOTICE file."
2012-08-09 16:25:19 -07:00
Elliott Hughes
387d4b7de9
Auto-generate a complete NOTICE file.
...
Remove the hand-collated ones, and switch to a script that pulls the
copyright headers out of every file and collects the unique ones.
Change-Id: Ied3b98b3f56241df97166c410ff81de4e0157c9d
2012-08-09 16:05:31 -07:00
Elliott Hughes
8cc8f7e0d5
am 709bb0f7
: Merge "Remove ThirdPartyProject.prop."
...
* commit '709bb0f79ced522e5fb145182472ee4063b85368':
Remove ThirdPartyProject.prop.
2012-08-09 14:46:00 -07:00
Elliott Hughes
709bb0f79c
Merge "Remove ThirdPartyProject.prop."
2012-08-09 14:31:27 -07:00
Elliott Hughes
df675370d7
Remove ThirdPartyProject.prop.
...
These are dead. I cleaned up external/ a long time ago, but didn't
realize there were any in the main tree.
Change-Id: I5f35b2da132558e2763164285eb38629cd68ffda
2012-08-09 14:29:23 -07:00
Elliott Hughes
531d348d6e
am a17b85d9
: Merge "Remove the last .jam file."
...
* commit 'a17b85d97b16583ba922a88346cc54976a0bfa28':
Remove the last .jam file.
2012-08-09 12:08:53 -07:00
Elliott Hughes
a17b85d97b
Merge "Remove the last .jam file."
2012-08-09 11:59:20 -07:00
Elliott Hughes
a554212992
Remove the last .jam file.
...
How did I miss this before?
Change-Id: I2e582133fc4800656fdd81104f8dfc7ee8f5b580
2012-08-09 11:54:23 -07:00
Elliott Hughes
3820229b46
am d504eee9
: Merge "MIPS support to sys/ headers"
...
* commit 'd504eee9fa7dda59a41eb3e12ef973f32ee1169f':
MIPS support to sys/ headers
2012-08-08 16:51:01 -07:00
Elliott Hughes
d504eee9fa
Merge "MIPS support to sys/ headers"
2012-08-08 16:32:55 -07:00
Elliott Hughes
d2040cb224
am f655ce7e
: Merge "Fix x86 build."
...
* commit 'f655ce7ef3df277442ccc47f91cb919c1cd9ebd6':
Fix x86 build.
2012-08-08 16:19:25 -07:00
Elliott Hughes
f655ce7ef3
Merge "Fix x86 build."
2012-08-08 16:07:27 -07:00
Elliott Hughes
57e6d9ab48
Fix x86 build.
...
Change-Id: Ice50ca71a19f3bf26de7cfd4c02075f1e6e0823f
2012-08-08 16:06:51 -07:00
Elliott Hughes
f3ffb8fa6e
am 78129204
: Merge "Clean up the linker a bit, remove prelinking support."
...
* commit '7812920487070d392984f94c9f80006dad8c198a':
Clean up the linker a bit, remove prelinking support.
2012-08-08 15:29:27 -07:00
Elliott Hughes
7812920487
Merge "Clean up the linker a bit, remove prelinking support."
2012-08-08 15:17:23 -07:00
Elliott Hughes
d463f6e980
am 34959e0b
: Merge "Clean up libc/Android.mk a bit after the crtbrand changes."
...
* commit '34959e0bd5c0d7c9d9b243adbf7752077436cbb5':
Clean up libc/Android.mk a bit after the crtbrand changes.
2012-08-08 14:40:54 -07:00
Elliott Hughes
34959e0bd5
Merge "Clean up libc/Android.mk a bit after the crtbrand changes."
2012-08-08 14:32:24 -07:00
Elliott Hughes
76be660aae
Clean up libc/Android.mk a bit after the crtbrand changes.
...
Change-Id: Icfb95fffe70967418cd93da8cbeae22dcd68f8c9
2012-08-08 14:07:37 -07:00
Jean-Baptiste Queru
9f3a8aaf92
am 7e248be7
: Merge "Add a .note.android.ident section to Android ELF binaries."
...
* commit '7e248be76441daa0ee27cc461c806e6010405c25':
Add a .note.android.ident section to Android ELF binaries.
2012-08-08 14:04:19 -07:00
Jean-Baptiste Queru
7e248be764
Merge "Add a .note.android.ident section to Android ELF binaries."
2012-08-08 13:44:27 -07:00
Elliott Hughes
4688279db5
Clean up the linker a bit, remove prelinking support.
...
Also make the errors more readable, since none of us seemed to know
what they actually meant. The new style is still as verbose as the
old, but that's probably necessary in the absence of chained exceptions
in C. Here's what you'd see if you try to boot after removing
libsurfaceflinger.so:
32267 32267 E AndroidRuntime: java.lang.UnsatisfiedLinkError: Cannot load library: (linker.c:1629, pid 32259) soinfo_link_image: could not load library "libsystem_server.so" needed by "libandroid_servers.so"; caused by (linker.c:1629, pid 32259) soinfo_link_image: could not load library "libsurfaceflinger.so" needed by "libsystem_server.so"; caused by (linker.c:709, pid 32259) load_library: library "libsurfaceflinger.so" not found
This patch also fixes almost all of the compiler warnings.
Change-Id: I64bb59aed6d4e039c15ea45be2367f319ef879f8
2012-08-07 11:41:10 -07:00
Shih-wei Liao
df523880b5
am e2731d98
: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
...
* commit 'e2731d98c1f0cd32d94b34cc4ee77148d6d52647':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
2012-08-06 11:08:40 -07:00
Shih-wei Liao
e2731d98c1
Merge "When compiling with clang, don't "fortify_source" the strlcpy and strlcat."
2012-08-06 11:02:19 -07:00
Shih-wei Liao
d600617645
When compiling with clang, don't "fortify_source" the strlcpy and
...
strlcat.
Change-Id: I91f58322f28e425ab9d22b51c23fcd6b772ede97
2012-08-06 10:57:37 -07:00
Shih-wei Liao
ce4a5cd5f3
am 8173d767
: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
...
* commit '8173d76740cafc2ceb49d2fddf1ceabfaa823236':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 10:17:09 -07:00
Shih-wei Liao
924fd92013
am 601a49d3
: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
...
* commit '601a49d39829005803670088da02179e61719551':
When compiling with clang, don't "fortify_source" the strlen.
2012-08-06 10:17:08 -07:00
Shih-wei Liao
8173d76740
Merge "Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute""
2012-08-06 10:05:15 -07:00
Shih-wei Liao
601a49d398
Merge "When compiling with clang, don't "fortify_source" the strlen."
2012-08-06 10:04:22 -07:00
Shih-wei Liao
9a3d53fad0
When compiling with clang, don't "fortify_source" the strlen.
...
At this point, FORTIFY_SOURCE and clang are just plain incompatible.
Need to solve the underlying incompatibility first.
Change-Id: I3366477d19461e1ec93b1c30e0c7e8145b391b9b
2012-08-06 09:50:56 -07:00
Elliott Hughes
94ce135693
am 7c92b6ca
: Merge "Remove an awkward #include that is no longer upstream."
...
* commit '7c92b6ca409f514e7ff67ac8c10d73ce92ff38d2':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:04:33 -07:00
Elliott Hughes
7c92b6ca40
Merge "Remove an awkward #include that is no longer upstream."
2012-08-06 07:57:59 -07:00
Shih-wei Liao
2b7f68c03d
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
...
This reverts commit 4f1f149c37
.
2012-08-03 17:44:08 -07:00
Elliott Hughes
7e81ee0453
am 1c861728
: Merge "Remove yet more SH4 cruft."
...
* commit '1c861728e5c8dda7589e6595f4850d77ec21a236':
Remove yet more SH4 cruft.
2012-08-03 15:09:55 -07:00
Elliott Hughes
1c861728e5
Merge "Remove yet more SH4 cruft."
2012-08-03 15:05:15 -07:00
Elliott Hughes
bbf094fdf5
Remove yet more SH4 cruft.
...
Surely this is the last piece?
Change-Id: I4bd43afb102334ec34d0e14a65c2b319826473d7
2012-08-03 14:58:18 -07:00
Elliott Hughes
f5385754e2
am aea5f00d
: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit 'aea5f00df4704a618331e16473b552e54bed269b':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:27:08 -07:00
Elliott Hughes
aea5f00df4
Merge "bionic: modify syscall to use 6 registers to pass parameter."
2012-08-03 13:55:56 -07:00
Jin Wei
c164f2a969
bionic: modify syscall to use 6 registers to pass parameter.
...
Kernel allows to use 6 registers(exclude eax) to pass parameter.
But in syscall's implementation, it only uses five registers.
It will lead to error when 6 parameters passed.
Change-Id: I92d663194e6334c3847f0c0c257ca3b9dee0edef
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>
Author-tracking-BZ: 30838
2012-08-03 13:54:29 -07:00
Elliott Hughes
c6f15ecf76
am 1510795f
: Merge "Upgrade to tzdata2012e."
...
* commit '1510795fec5aa8b8700a08200f37f6e57dea8d04':
Upgrade to tzdata2012e.
2012-08-03 13:30:44 -07:00
Elliott Hughes
1510795fec
Merge "Upgrade to tzdata2012e."
2012-08-03 12:30:18 -07:00