Christopher Ferris
fc11ebc501
am 3d5a4240
: Merge "Fix build."
...
* commit '3d5a42408ca24f86b8b81697b20012736cb48c2b':
Fix build.
2014-05-21 18:50:10 +00:00
Christopher Ferris
3d5a42408c
Merge "Fix build."
2014-05-21 18:47:36 +00:00
Christopher Ferris
8d2410d33d
Fix build.
...
Change-Id: I5a35eee4074e35f459c86c7f9b1d9b0754888940
2014-05-21 11:45:51 -07:00
Christopher Ferris
c1df57d60e
am bce2357e
: am c1be1ecc
: am 011076b7
: Merge "Support for jemalloc to replace dlmalloc."
...
* commit 'bce2357e42fdfb45556ec57ccb54d587e645f196':
Support for jemalloc to replace dlmalloc.
2014-05-21 18:24:30 +00:00
Christopher Ferris
bce2357e42
am c1be1ecc
: am 011076b7
: Merge "Support for jemalloc to replace dlmalloc."
...
* commit 'c1be1eccbb22e136de933824cd003c1dad9b17e5':
Support for jemalloc to replace dlmalloc.
2014-05-21 18:21:28 +00:00
Elliott Hughes
91b4613403
am 68396799
: am c5f723ae
: am c1b7f44c
: Merge "Remove __syslog; we have the public klogctl API."
...
* commit '683967991425addf38a24024ae5503768a813b64':
Remove __syslog; we have the public klogctl API.
2014-05-21 18:17:26 +00:00
Christopher Ferris
c1be1eccbb
am 011076b7
: Merge "Support for jemalloc to replace dlmalloc."
...
* commit '011076b720b0809a6b94703780e768cd7b877c68':
Support for jemalloc to replace dlmalloc.
2014-05-21 18:16:41 +00:00
Elliott Hughes
6839679914
am c5f723ae
: am c1b7f44c
: Merge "Remove __syslog; we have the public klogctl API."
...
* commit 'c5f723aef55912545b3dc32983a58974c5193e5e':
Remove __syslog; we have the public klogctl API.
2014-05-21 18:14:08 +00:00
Christopher Ferris
011076b720
Merge "Support for jemalloc to replace dlmalloc."
2014-05-21 18:12:50 +00:00
Elliott Hughes
3db501139b
am c323b97c
: am 87987df9
: am daf69128
: Merge "Fix x86_64 __set_tls.c build failure."
...
* commit 'c323b97c52297c4342dd45e329bad816f3bc5746':
Fix x86_64 __set_tls.c build failure.
2014-05-21 18:10:23 +00:00
Elliott Hughes
c5f723aef5
am c1b7f44c
: Merge "Remove __syslog; we have the public klogctl API."
...
* commit 'c1b7f44c13fbcbab3faaa8e11d3a459ebc11bfe5':
Remove __syslog; we have the public klogctl API.
2014-05-21 18:09:55 +00:00
Elliott Hughes
c1b7f44c13
Merge "Remove __syslog; we have the public klogctl API."
2014-05-21 18:07:05 +00:00
Neil Fuller
a073b4ee0a
am 55326c4b
: am b7a23959
: am 76805140
: Merge "Treat zero or >1 dat files as an error"
...
* commit '55326c4b9714cba3e7bf0e27ceea0e2b91240d6f':
Treat zero or >1 dat files as an error
2014-05-21 17:28:39 +00:00
Calin Juravle
ae0f8f1e48
Add padding to mips ucontext_t.
...
Bug: 12828904
Change-Id: I49e7adcebf769a9c30dc43def36501260369b1ac
2014-05-21 18:16:17 +01:00
Calin Juravle
eb454522da
Clean up ucontext.h TODOs.
...
There's no need to expose gregset_t and fpregset_t when they
are not used in ucontext_t.
Bug: 12828904
Change-Id: Ieda1edf0ab18015f444c4d385fe9c41c4544017f
2014-05-21 18:15:35 +01:00
Elliott Hughes
c323b97c52
am 87987df9
: am daf69128
: Merge "Fix x86_64 __set_tls.c build failure."
...
* commit '87987df99034265fdfeebe315e6545d809379ede':
Fix x86_64 __set_tls.c build failure.
2014-05-21 17:07:46 +00:00
Elliott Hughes
87987df990
am daf69128
: Merge "Fix x86_64 __set_tls.c build failure."
...
* commit 'daf6912838dd27e3c064c4e7df98b6165549af82':
Fix x86_64 __set_tls.c build failure.
2014-05-21 17:05:11 +00:00
Elliott Hughes
daf6912838
Merge "Fix x86_64 __set_tls.c build failure."
2014-05-21 17:02:44 +00:00
Elliott Hughes
7136927d39
Fix x86_64 __set_tls.c build failure.
...
Change-Id: I697b8ab4ce781d7aebeddb1391b63c653511bbcb
2014-05-21 10:02:00 -07:00
Neil Fuller
55326c4b97
am b7a23959
: am 76805140
: Merge "Treat zero or >1 dat files as an error"
...
* commit 'b7a23959984c5407d8cc138ccf017da493c1d24e':
Treat zero or >1 dat files as an error
2014-05-21 16:26:01 +00:00
Neil Fuller
b7a2395998
am 76805140
: Merge "Treat zero or >1 dat files as an error"
...
* commit '768051405e8d471e06447a5b7223c742022f525a':
Treat zero or >1 dat files as an error
2014-05-21 16:22:27 +00:00
Neil Fuller
768051405e
Merge "Treat zero or >1 dat files as an error"
2014-05-21 16:18:59 +00:00
Neil Fuller
43f3715953
Treat zero or >1 dat files as an error
...
Based on feedback from
I7efbd6f453fe2b3e71f564121ff0f64a74289d86
Change-Id: Ie131ab8475083350dc183d9f6d5ea7a0b0617c5b
2014-05-21 17:18:17 +01:00
Elliott Hughes
b8297bfdf6
am ee2939db
: am ceed7b76
: am 29f2906b
: Merge "Add a few more symbols to check-symbols-glibc."
...
* commit 'ee2939dbf9d6574394249548e94a31575b4ada2d':
Add a few more symbols to check-symbols-glibc.
2014-05-21 15:35:58 +00:00
Elliott Hughes
ee2939dbf9
am ceed7b76
: am 29f2906b
: Merge "Add a few more symbols to check-symbols-glibc."
...
* commit 'ceed7b76b768aaa0dd84769afd689336f5b5ac98':
Add a few more symbols to check-symbols-glibc.
2014-05-21 15:32:10 +00:00
Elliott Hughes
66af04b512
am a7293ddb
: am 7a611f18
: am 9f0a52e4
: Merge "Hide __get_sp."
...
* commit 'a7293ddb8da94cc823ec28b851f69ef2d99a70d4':
Hide __get_sp.
2014-05-21 15:31:13 +00:00
Elliott Hughes
802383df53
am f55dc413
: am 0aa1fb1c
: am 7471a370
: Merge "Hide __set_tls."
...
* commit 'f55dc41303417904136902698191fd0f0fe3a061':
Hide __set_tls.
2014-05-21 15:31:12 +00:00
Elliott Hughes
a7293ddb8d
am 7a611f18
: am 9f0a52e4
: Merge "Hide __get_sp."
...
* commit '7a611f184d2a8e1a5e8187629ff95ad793d561ac':
Hide __get_sp.
2014-05-21 15:28:19 +00:00
Elliott Hughes
f55dc41303
am 0aa1fb1c
: am 7471a370
: Merge "Hide __set_tls."
...
* commit '0aa1fb1c1672a3bbe63155e05e445826c64aafb7':
Hide __set_tls.
2014-05-21 15:28:18 +00:00
Elliott Hughes
ceed7b76b7
am 29f2906b
: Merge "Add a few more symbols to check-symbols-glibc."
...
* commit '29f2906bdaf9afe816fc9196437fc07728af98bf':
Add a few more symbols to check-symbols-glibc.
2014-05-21 15:28:00 +00:00
Elliott Hughes
7a611f184d
am 9f0a52e4
: Merge "Hide __get_sp."
...
* commit '9f0a52e4e5afc20a61230e6cbfe735606bff7e0c':
Hide __get_sp.
2014-05-21 15:24:33 +00:00
Elliott Hughes
0aa1fb1c16
am 7471a370
: Merge "Hide __set_tls."
...
* commit '7471a3700348df588d4da35a41b38f6a88b505fd':
Hide __set_tls.
2014-05-21 15:24:32 +00:00
Elliott Hughes
29f2906bda
Merge "Add a few more symbols to check-symbols-glibc."
2014-05-21 15:23:35 +00:00
Elliott Hughes
9f0a52e4e5
Merge "Hide __get_sp."
2014-05-21 15:21:16 +00:00
Elliott Hughes
7471a37003
Merge "Hide __set_tls."
2014-05-21 15:21:01 +00:00
The Android Automerger
f584321edc
merge in master-release history after reset to 9e2595d7b6
2014-05-21 05:49:22 -07:00
Neil Fuller
9e2595d7b6
am fa5903ed
: am 3248b9d3
: am 22784885
: Merge "Change update-tzdata.py to update ICU data as well"
...
* commit 'fa5903edf32062d95a4a09f34571a640c1429eb6':
Change update-tzdata.py to update ICU data as well
2014-05-21 11:17:01 +00:00
Neil Fuller
fa5903edf3
am 3248b9d3
: am 22784885
: Merge "Change update-tzdata.py to update ICU data as well"
...
* commit '3248b9d33c14bef51a07146ce93ec810c07c01e3':
Change update-tzdata.py to update ICU data as well
2014-05-21 08:49:25 +00:00
Neil Fuller
3248b9d33c
am 22784885
: Merge "Change update-tzdata.py to update ICU data as well"
...
* commit '227848854695fe5b6f7183fe507edf093808d8ff':
Change update-tzdata.py to update ICU data as well
2014-05-21 08:44:18 +00:00
Neil Fuller
2278488546
Merge "Change update-tzdata.py to update ICU data as well"
2014-05-21 08:11:40 +00:00
Elliott Hughes
46a55a4478
Remove __syslog; we have the public klogctl API.
...
Bug: 11156955
Change-Id: I5c2cc02f39f76dd32984135f5c12c10bf2853796
2014-05-20 21:01:00 -07:00
Elliott Hughes
b497c43336
Add a few more symbols to check-symbols-glibc.
...
Bug: 11156955
Change-Id: Iee0bae6f9742eca188abc7a337371c50888a0ad6
2014-05-20 20:58:23 -07:00
Elliott Hughes
a75869f0b2
Hide __set_tls.
...
Bug: 11156955
Change-Id: If82c10ae412651361d09591017d1c3a411bd6f0b
2014-05-20 20:32:28 -07:00
Elliott Hughes
dc961faa95
am 58425608
: am a9e2ffd8
: am 20177b9f
: Merge "Remove perf_event_open."
...
* commit '5842560845af94c2f15a1e7186c800e0f1e6224b':
Remove perf_event_open.
2014-05-21 03:28:15 +00:00
Elliott Hughes
5842560845
am a9e2ffd8
: am 20177b9f
: Merge "Remove perf_event_open."
...
* commit 'a9e2ffd8e5cb385d85000c02636514d439bcedec':
Remove perf_event_open.
2014-05-21 03:25:52 +00:00
Elliott Hughes
c3705f6415
Hide __get_sp.
...
Bug: 11156955
Change-Id: I55d8d320521e80c2085af28933a18b00cf5c714e
2014-05-20 20:22:50 -07:00
Elliott Hughes
a9e2ffd8e5
am 20177b9f
: Merge "Remove perf_event_open."
...
* commit '20177b9fea893ab63a49cf574790ea5e5027e50d':
Remove perf_event_open.
2014-05-21 03:22:22 +00:00
Elliott Hughes
20177b9fea
Merge "Remove perf_event_open."
2014-05-21 03:11:58 +00:00
Colin Cross
4d9fe6863f
am 57889849
: am 8a6217df
: am 3d2bc5d6
: Merge "HACK: linker: check for handle==0xffffffff on LP64"
...
* commit '5788984925a13b964c8003616773695fa4ef519b':
HACK: linker: check for handle==0xffffffff on LP64
2014-05-21 00:01:48 +00:00
Colin Cross
5788984925
am 8a6217df
: am 3d2bc5d6
: Merge "HACK: linker: check for handle==0xffffffff on LP64"
...
* commit '8a6217df921eadf7e2f92fb82f2e6f1bfe36d5cb':
HACK: linker: check for handle==0xffffffff on LP64
2014-05-20 23:45:48 +00:00