The Android Open Source Project
1551f18af0
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Idae4db637990d9326dffba6d0679f520f7c69da0
2012-08-10 08:51:39 -07:00
Elliott Hughes
8e1e66da21
am 31ab6ac0
: am 8cc8f7e0
: am 709bb0f7
: Merge "Remove ThirdPartyProject.prop."
...
* commit '31ab6ac05ebbf29f767a15525f6f7fa2054cc8e3':
Remove ThirdPartyProject.prop.
2012-08-09 14:49:14 -07:00
Elliott Hughes
31ab6ac05e
am 8cc8f7e0
: am 709bb0f7
: Merge "Remove ThirdPartyProject.prop."
...
* commit '8cc8f7e0d566aaa4c4fbf9d9c8da72b268250617':
Remove ThirdPartyProject.prop.
2012-08-09 14:47:24 -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
9550a7c57c
am 3fc21198
: am 531d348d
: am a17b85d9
: Merge "Remove the last .jam file."
...
* commit '3fc211983eb447dd4309c2f8d0e8c33ae685f02f':
Remove the last .jam file.
2012-08-09 12:13:27 -07:00
Elliott Hughes
3fc211983e
am 531d348d
: am a17b85d9
: Merge "Remove the last .jam file."
...
* commit '531d348d6e37deb751efbefc0613934c5a80de1d':
Remove the last .jam file.
2012-08-09 12:11:08 -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
The Android Automerger
536b1daf00
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-09 09:29:41 -07:00
Elliott Hughes
0ac6d23515
am b13ad93f
: am 3820229b
: am d504eee9
: Merge "MIPS support to sys/ headers"
...
* commit 'b13ad93f4a452b1ec7a37e1426f664787b83836f':
MIPS support to sys/ headers
2012-08-08 17:47:30 -07:00
Elliott Hughes
1afca3f698
am 73ac7d94
: am d2040cb2
: am f655ce7e
: Merge "Fix x86 build."
...
* commit '73ac7d94b7cf627524be97da7704206b5ffd4fcf':
Fix x86 build.
2012-08-08 17:47:29 -07:00
Elliott Hughes
b13ad93f4a
am 3820229b
: am d504eee9
: Merge "MIPS support to sys/ headers"
...
* commit '3820229b46ed3012f19a32cea70b6007ad54b746':
MIPS support to sys/ headers
2012-08-08 17:44:20 -07:00
Elliott Hughes
73ac7d94b7
am d2040cb2
: am f655ce7e
: Merge "Fix x86 build."
...
* commit 'd2040cb2244bbd253951b5ff808efe67246e5154':
Fix x86 build.
2012-08-08 17:44:14 -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
b02f100fa4
am 366c0199
: am f3ffb8fa
: am 78129204
: Merge "Clean up the linker a bit, remove prelinking support."
...
* commit '366c01992a73c40c1b6722bf9d51755c4a7ea83e':
Clean up the linker a bit, remove prelinking support.
2012-08-08 15:32:19 -07:00
Elliott Hughes
366c01992a
am f3ffb8fa
: am 78129204
: Merge "Clean up the linker a bit, remove prelinking support."
...
* commit 'f3ffb8fa6ecd9db2da19eb3144a5da7724a875bc':
Clean up the linker a bit, remove prelinking support.
2012-08-08 15:30:39 -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
96fd66018c
am 10e2d222
: am d463f6e9
: am 34959e0b
: Merge "Clean up libc/Android.mk a bit after the crtbrand changes."
...
* commit '10e2d222ce3db0c310c00cd1a5cffdd2223b5dfe':
Clean up libc/Android.mk a bit after the crtbrand changes.
2012-08-08 14:43:55 -07:00
Elliott Hughes
10e2d222ce
am d463f6e9
: am 34959e0b
: Merge "Clean up libc/Android.mk a bit after the crtbrand changes."
...
* commit 'd463f6e98011fe3b5a23cef2502705dedd702173':
Clean up libc/Android.mk a bit after the crtbrand changes.
2012-08-08 14:43:00 -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
Jean-Baptiste Queru
d0a7bc2fd6
am affd1b42
: am 9f3a8aaf
: am 7e248be7
: Merge "Add a .note.android.ident section to Android ELF binaries."
...
* commit 'affd1b4243f37d32881e190302bd418000465c10':
Add a .note.android.ident section to Android ELF binaries.
2012-08-08 14:10:45 -07:00
Jean-Baptiste Queru
affd1b4243
am 9f3a8aaf
: am 7e248be7
: Merge "Add a .note.android.ident section to Android ELF binaries."
...
* commit '9f3a8aaf926bb0439b7e6b7b62efab62f1900d02':
Add a .note.android.ident section to Android ELF binaries.
2012-08-08 14:08:29 -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
The Android Open Source Project
d9c2de10d9
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I753a2c0b3bfb42c526b954e58d8874daf31420ed
2012-08-07 11:02:30 -07:00
The Android Automerger
eeb321c54e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-07 06:33:32 -07:00
The Android Open Source Project
45193df53a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: If9b215d19d88c3f1793013adc8cb81c8c890faa0
2012-08-06 13:34:18 -07:00
The Android Open Source Project
1466b1aad2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I801dd8874ff1b1b61858cac3bf716906825b214d
2012-08-06 13:17:46 -07:00
Shih-wei Liao
f4497e15b7
When compiling with clang, don't "fortify_source" the strlcpy and
...
strlcat.
Change-Id: I91f58322f28e425ab9d22b51c23fcd6b772ede97
2012-08-06 13:17:05 -07:00
Shih-wei Liao
a72246d67e
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 13:16:56 -07:00
Shih-wei Liao
5fec211f60
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
...
This reverts commit 4f1f149c37
.
2012-08-06 13:16:48 -07:00
Shih-wei Liao
25ef2bbf01
am 3b4c9db2
: am df523880
: am e2731d98
: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
...
* commit '3b4c9db2561233fb81ac0c42b3976deb2e648df0':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
2012-08-06 11:10:41 -07:00
Shih-wei Liao
3b4c9db256
am df523880
: am e2731d98
: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
...
* commit 'df523880b59604ef36e212cb7ba30d663eeea179':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
2012-08-06 11:09:35 -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
42bfbd1e61
am 6ff66601
: am ce4a5cd5
: am 8173d767
: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
...
* commit '6ff66601a47d7b74544310e4a5535d572e23d68e':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 10:20:48 -07:00
Shih-wei Liao
ed33635da7
am cddedade
: am 924fd920
: am 601a49d3
: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
...
* commit 'cddedade5b1138d5ddafe5b084923f21bba75526':
When compiling with clang, don't "fortify_source" the strlen.
2012-08-06 10:20:47 -07:00
Shih-wei Liao
6ff66601a4
am ce4a5cd5
: am 8173d767
: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
...
* commit 'ce4a5cd5f3ee09fbc8dea7ffdfcd4fd097f8ed34':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 10:18:21 -07:00