The Android Automerger
803bd660b6
merge in master-release history after reset to master
2012-12-31 07:49:13 -08:00
Elliott Hughes
36a9f354c0
am c0c05ff8
: am 918d776f
: Merge "Support System.loadLibrary for libraries with transitive dependencies."
...
* commit 'c0c05ff8ecfe5f27aedcd6315e191245aa7b4824':
Support System.loadLibrary for libraries with transitive dependencies.
2012-12-28 09:48:19 -08:00
Elliott Hughes
0ce87c8984
am df5c77c9
: am f6524f8b
: Merge "Fix format_number."
...
* commit 'df5c77c91a276a79d05f58241df3695b56422d54':
Fix format_number.
2012-12-28 09:46:53 -08:00
Elliott Hughes
c0c05ff8ec
am 918d776f
: Merge "Support System.loadLibrary for libraries with transitive dependencies."
...
* commit '918d776f7edf1a9c4209ada4c2401ef0ea0bf660':
Support System.loadLibrary for libraries with transitive dependencies.
2012-12-21 17:54:07 -08:00
Elliott Hughes
918d776f7e
Merge "Support System.loadLibrary for libraries with transitive dependencies."
2012-12-21 17:46:22 -08:00
Elliott Hughes
df5c77c91a
am f6524f8b
: Merge "Fix format_number."
...
* commit 'f6524f8bda87f7d25dad7bed7091a93f3de58728':
Fix format_number.
2012-12-21 10:04:27 -08:00
Elliott Hughes
f6524f8bda
Merge "Fix format_number."
2012-12-20 19:08:17 -08:00
Elliott Hughes
eababde214
Fix format_number.
...
I broke this the other day when silencing x86 gcc warnings.
Bug: 7904160
Change-Id: I8e60cc1f8cbaff95248c8738d84e515413d839e4
2012-12-20 19:00:48 -08:00
Elliott Hughes
cade4c36e7
Support System.loadLibrary for libraries with transitive dependencies.
...
Also fix the FLAG_ERROR annoyance --- it's not helpful to cache failures.
Bug: 7896159
Bug: http://code.google.com/p/android/issues/detail?id=34416
Bug: http://code.google.com/p/android/issues/detail?id=22143
Change-Id: I60f235edb4ea4756e1f7ce56f7739f18e8a50789
2012-12-20 14:42:14 -08:00
The Android Automerger
2937d9ab54
merge in master-release history after reset to master
2012-12-20 07:49:12 -08:00
Elliott Hughes
d020802e37
am 5fd31f68
: am 4b582142
: Merge "Fix x86 dynamic linker build."
...
* commit '5fd31f6891a6e0b5db84c4c7992d0a4b08f3dddd':
Fix x86 dynamic linker build.
2012-12-19 09:51:36 -08:00
Elliott Hughes
5fd31f6891
am 4b582142
: Merge "Fix x86 dynamic linker build."
...
* commit '4b58214205d3d29dbdfed49964010235ef3f0403':
Fix x86 dynamic linker build.
2012-12-19 09:46:32 -08:00
The Android Automerger
efe3ca7b48
merge in master-release history after reset to master
2012-12-19 07:49:06 -08:00
Elliott Hughes
05ab167cf7
am a0edecf3
: am a4ebdcf5
: Merge "Check for unknown flags passed to dlopen(3)."
...
* commit 'a0edecf3438d036ee2353076d171ee68939c2a5e':
Check for unknown flags passed to dlopen(3).
2012-12-18 19:44:10 -08:00
Elliott Hughes
a0edecf343
am a4ebdcf5
: Merge "Check for unknown flags passed to dlopen(3)."
...
* commit 'a4ebdcf5bd20072f9a0e48c22fff401acda43e1e':
Check for unknown flags passed to dlopen(3).
2012-12-18 19:41:24 -08:00
Elliott Hughes
4b58214205
Merge "Fix x86 dynamic linker build."
2012-12-18 18:16:09 -08:00
Elliott Hughes
45288c5ce3
Fix x86 dynamic linker build.
...
Change-Id: Ia9fc6342e3d409de86dcd187c7402e8ac2ae96c8
2012-12-18 18:13:19 -08:00
Elliott Hughes
a4ebdcf5bd
Merge "Check for unknown flags passed to dlopen(3)."
2012-12-18 16:38:37 -08:00
Elliott Hughes
e66190d2a9
Check for unknown flags passed to dlopen(3).
...
Change-Id: I56f4aab0e5a1487bc32d2c4d231e8bd15c4ac8da
2012-12-18 15:57:55 -08:00
The Android Automerger
b9cb7ee082
merge in master-release history after reset to master
2012-12-12 07:49:10 -08:00
Elliott Hughes
78b90c744d
am 607bd477
: am 4c4b08a3
: Merge "Fix <endian.h> and <sys/endian.h>."
...
* commit '607bd47707680db36f377c5e8fc330953fd407e7':
Fix <endian.h> and <sys/endian.h>.
2012-12-11 17:29:17 -08:00
Elliott Hughes
607bd47707
am 4c4b08a3
: Merge "Fix <endian.h> and <sys/endian.h>."
...
* commit '4c4b08a32eace878e4780ee340a57c43be950159':
Fix <endian.h> and <sys/endian.h>.
2012-12-11 17:27:41 -08:00
Elliott Hughes
4c4b08a32e
Merge "Fix <endian.h> and <sys/endian.h>."
2012-12-11 17:18:58 -08:00
Elliott Hughes
4fa35d8ae8
Fix <endian.h> and <sys/endian.h>.
...
Previously we'd been relying on getting the machine-specific <endian.h>
instead of the top-level <endian.h>, and <sys/endian.h> was basically broken.
Now, with this patch and the previous patch we should have <endian.h>
and <sys/endian.h> behaving the same. This is basically how NetBSD's endian.h
works, and was probably how ours was originally intended to work.
Bug: http://code.google.com/p/android/issues/detail?id=39824
Change-Id: I71de5a507e633de166013a658b5764df9e1aa09c
2012-12-11 16:17:33 -08:00
The Android Automerger
f096529317
merge in master-release history after reset to master
2012-12-11 07:49:16 -08:00
Elliott Hughes
42d7a26d23
am f822e7f6
: am 0521ff82
: Merge "Use pthread_kill() in raise()"
...
* commit 'f822e7f68eec30bb175ccb46cd379f4a060b6c74':
Use pthread_kill() in raise()
2012-12-10 11:42:06 -08:00
Elliott Hughes
f822e7f68e
am 0521ff82
: Merge "Use pthread_kill() in raise()"
...
* commit '0521ff8234cafcc61060961b2f856fcf4dae1e7d':
Use pthread_kill() in raise()
2012-12-10 11:40:04 -08:00
Elliott Hughes
0521ff8234
Merge "Use pthread_kill() in raise()"
2012-12-10 11:21:42 -08:00
Chris Dearman
d8a5a6f513
Use pthread_kill() in raise()
...
raise() should use pthread_kill() in a pthreads environment.
For bionic this means it should always be used.
Change-Id: Ic679272b664d2b8a7068b628fb83a9f7395c441f
2012-12-10 11:20:57 -08:00
The Android Automerger
d08e76cd35
merge in master-release history after reset to master
2012-12-10 07:49:11 -08:00
Geremy Condra
edb53b3e9d
am 28996f80
: am 6fcf1770
: Merge "Added audit.h from the kernel."
...
* commit '28996f80064579566d5a2ec5c69a00ef159a7e32':
Added audit.h from the kernel.
2012-12-07 14:34:12 -08:00
Geremy Condra
28996f8006
am 6fcf1770
: Merge "Added audit.h from the kernel."
...
* commit '6fcf1770e5829b8439b7e7ed7efb39ee5d425e23':
Added audit.h from the kernel.
2012-12-07 14:32:21 -08:00
Geremy Condra
6fcf1770e5
Merge "Added audit.h from the kernel."
2012-12-07 14:21:16 -08:00
Geremy Condra
03e1ebbdd6
Added audit.h from the kernel.
...
Just followed the recipe in I1ca996541d05b0d5927ab828a6ce49c09877ea01
Change-Id: I5713d9ce5ff62e310a694ecfbe21cad6577bcb4d
2012-12-07 14:13:23 -08:00
Nick Kralevich
a710682db3
am 080210c1
: am c8354f50
: Merge "FORTIFY_SOURCE: remove memcpy overlap checks"
...
* commit '080210c16a3c233dacf26dda168932a475fdd40b':
FORTIFY_SOURCE: remove memcpy overlap checks
2012-12-07 12:24:08 -08:00
Nick Kralevich
5e6213af54
am 79e1a01e
: am 5dfdb701
: Merge "FORTIFY_SOURCE: fix up previous commit"
...
* commit '79e1a01e9e994d88e17f6d11819dcfd35cfa5e19':
FORTIFY_SOURCE: fix up previous commit
2012-12-07 12:24:07 -08:00
Nick Kralevich
080210c16a
am c8354f50
: Merge "FORTIFY_SOURCE: remove memcpy overlap checks"
...
* commit 'c8354f501ef9a6d3430de27386bf0b42c30981d9':
FORTIFY_SOURCE: remove memcpy overlap checks
2012-12-07 12:19:08 -08:00
Nick Kralevich
79e1a01e9e
am 5dfdb701
: Merge "FORTIFY_SOURCE: fix up previous commit"
...
* commit '5dfdb701292c53e74e319f277d808e598389c8e7':
FORTIFY_SOURCE: fix up previous commit
2012-12-07 12:18:58 -08:00
Nick Kralevich
c8354f501e
Merge "FORTIFY_SOURCE: remove memcpy overlap checks"
2012-12-07 10:10:49 -08:00
Nick Kralevich
5787475390
FORTIFY_SOURCE: remove memcpy overlap checks
...
These checks haven't been as useful as I hoped, and it's
causing a false positive finding. Remove the overlap
compile time checks.
Change-Id: I5d45dde10ae4663d728230d41fa904adf20acaea
2012-12-07 09:57:01 -08:00
Nick Kralevich
5dfdb70129
Merge "FORTIFY_SOURCE: fix up previous commit"
2012-12-06 14:48:24 -08:00
The Android Automerger
439bc8d540
merge in master-release history after reset to master
2012-12-06 07:49:14 -08:00
Nick Kralevich
8b6fea59ac
FORTIFY_SOURCE: fix up previous commit
...
I forgot two files in 326ea5413d
.
Change-Id: I30430f65bfafad4274193fc5b973959eac0791a7
2012-12-05 15:26:54 -08:00
Nick Kralevich
1c88362021
am 8717c3db
: am 7a34ed2b
: Merge "clean up FORTIFY_SOURCE handling."
...
* commit '8717c3db2f864226bb68c7e26ad73fcff1212b31':
clean up FORTIFY_SOURCE handling.
2012-12-05 08:25:37 -08:00
The Android Automerger
c3d031ee91
merge in master-release history after reset to master
2012-12-05 07:49:06 -08:00
Nick Kralevich
8717c3db2f
am 7a34ed2b
: Merge "clean up FORTIFY_SOURCE handling."
...
* commit '7a34ed2bb36fcbe6967d8b670f4d70ada1dcef49':
clean up FORTIFY_SOURCE handling.
2012-12-04 15:52:53 -08:00
Nick Kralevich
7a34ed2bb3
Merge "clean up FORTIFY_SOURCE handling."
2012-12-04 15:44:22 -08:00
Nick Kralevich
326ea5413d
clean up FORTIFY_SOURCE handling.
...
Avoid duplicating huge chunks of code.
Change-Id: Id6145cdfce781c5ffba2abaaa79681d25a7ab28f
2012-12-04 15:27:30 -08:00
Nick Kralevich
babe7e16a1
am ded6e3bf
: am db79e827
: Merge "FORTIFY_SOURCE: fortify strrchr"
...
* commit 'ded6e3bfca3010350d58d93f5f0f5cea256a4f73':
FORTIFY_SOURCE: fortify strrchr
2012-12-04 11:45:28 -08:00
Nick Kralevich
ded6e3bfca
am db79e827
: Merge "FORTIFY_SOURCE: fortify strrchr"
...
* commit 'db79e827ebcb077ebaa6d6c96915c5bffba9a0ca':
FORTIFY_SOURCE: fortify strrchr
2012-12-04 11:43:30 -08:00