Christopher Ferris
ae7bf0959b
Fix adb/fastboot windows compilations.
...
Many of the windows files where not including stdlib.h even though they
are using malloc/free calls.
Change-Id: If6959df9909d9d9928e9f4a2a96018166361cf3c
2014-11-06 14:34:24 -08:00
Nick Kralevich
ba2d22c4ad
Ensure /data/adb exists automerge: 6672300
...
automerge: ac12f25
2014-11-05 20:01:50 +00:00
Nick Kralevich
ac12f25004
Ensure /data/adb exists
...
automerge: 6672300
2014-11-05 19:18:32 +00:00
Nick Kralevich
667230074b
Ensure /data/adb exists
...
Ensure that /data/adb always exists. This directory is used
for writing adb debugging information when persist.adb.trace_mask
is set.
Bug: https://code.google.com/p/android/issues/detail?id=72895
(cherry picked from commit 89252ce31a
2014-11-05 10:17:39 -08:00
Elliott Hughes
1635b81b22
am 26552565: am 452f08a0: Merge "Add razer usb vid for future use with adb"
...
* commit '2655256570b7c1c5af6d886735835eecb99f45f2':
Add razer usb vid for future use with adb
2014-11-05 02:57:28 +00:00
Dan Albert
dc1c2820c7
am 5fc8f683: am 7a92d20e: Merge "Clean up some test makefiles."
...
* commit '5fc8f683e6345353d418cb32f4f8335964e1613b':
Clean up some test makefiles.
2014-11-05 02:53:08 +00:00
Elliott Hughes
2655256570
am 452f08a0: Merge "Add razer usb vid for future use with adb"
...
* commit '452f08a0b78e65cbd7e4cddac133e59f94d5db4c':
Add razer usb vid for future use with adb
2014-11-05 02:42:04 +00:00
Dan Albert
5fc8f683e6
am 7a92d20e: Merge "Clean up some test makefiles."
...
* commit '7a92d20ec845c07472eaea7cf14fd0e69df836ef':
Clean up some test makefiles.
2014-11-05 02:27:42 +00:00
Elliott Hughes
452f08a0b7
Merge "Add razer usb vid for future use with adb"
2014-11-05 01:44:24 +00:00
Dan Albert
7a92d20ec8
Merge "Clean up some test makefiles."
2014-11-05 01:23:40 +00:00
Dan Albert
27d166cb3a
Clean up some test makefiles.
...
Needed for building with libc++ as the default STL.
Bug: 15193147
Change-Id: I8b462bd288fbea7e0ab182f85ffcbf438afb6aa4
2014-11-04 17:19:55 -08:00
Michael Lentine
98a51de1cc
Merge "Fix native_handle_create to check if malloc fails" into lmp-mr1-dev
...
automerge: b542285
2014-11-04 00:04:42 +00:00
Christopher Ferris
68573fc5ef
am 4b970895: am 5bd96311: DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d -s ours automerge: d7c8db1 -s ours
...
automerge: 56bf9d8
2014-11-03 23:48:31 +00:00
Christopher Ferris
2f30ba2e57
am a18bcfa4: am 91ce3576: resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp. automerge: e916313
...
automerge: a228c63
2014-11-03 23:48:27 +00:00
Michael Lentine
b542285436
Merge "Fix native_handle_create to check if malloc fails" into lmp-mr1-dev
2014-11-03 22:13:48 +00:00
Michael Lentine
2b8852dece
Fix native_handle_create to check if malloc fails
...
Bug: 18076253
Change-Id: I8dbe3af88f52f18f74a3ab857fea53ae7585e2f7
2014-11-03 13:48:15 -08:00
Christopher Ferris
56bf9d8e60
am 4b970895: am 5bd96311: DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d -s ours automerge: d7c8db1 -s ours
...
* commit '4b970895848ff114ac1011a293663eb6d43e8fd7':
2014-11-03 21:11:40 +00:00
Christopher Ferris
a228c63288
am a18bcfa4: am 91ce3576: resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp. automerge: e916313
...
* commit 'a18bcfa45e9d37650bca158577d02f5059453935':
2014-11-03 21:11:39 +00:00
Christopher Ferris
4b97089584
am 5bd96311: DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d -s ours automerge: d7c8db1 -s ours
...
* commit '5bd963117aa121d1fdfd5def4379cd363cf60ece':
2014-11-03 21:02:01 +00:00
Christopher Ferris
a18bcfa45e
am 91ce3576: resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp. automerge: e916313
...
* commit '91ce3576337b0541912da7ec4b1efd802568dfce':
2014-11-03 21:02:00 +00:00
Christopher Ferris
5bd963117a
DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d -s ours
...
automerge: d7c8db1
2014-11-03 20:53:33 +00:00
Christopher Ferris
91ce357633
resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.
...
automerge: e916313
2014-11-03 20:53:28 +00:00
Christopher Ferris
0f6def890c
am d4c7a1cf: am a11ac455: Merge "Fix debuggerd issues."
...
* commit 'd4c7a1cfad22a55d31b6a27b859fb534194fb0e4':
Fix debuggerd issues.
2014-11-03 20:31:21 +00:00
Christopher Ferris
d4c7a1cfad
am a11ac455: Merge "Fix debuggerd issues."
...
* commit 'a11ac45536f0722becefccdb6b58378c5d9d0d4b':
Fix debuggerd issues.
2014-11-03 20:23:55 +00:00
Christopher Ferris
a11ac45536
Merge "Fix debuggerd issues."
2014-11-03 20:20:20 +00:00
Christopher Ferris
9ed59f39bc
Merge "Fix debuggerd issues." into lmp-mr1-dev
...
automerge: b87e827
2014-11-03 20:00:31 +00:00
Christopher Ferris
1072f917cf
Fix debuggerd issues.
...
- Fix a problem where a tid exits before the attach completes, and it
causes debuggerd to self terminate.
- Fix a problem where sibling tid dumps do not properly wait for the tid
to get signalled.
Bug: 17800180
Bug: 12567315
(cherry picked from commit 84ddb34a3a
2014-11-03 11:26:33 -08:00
Christopher Ferris
b87e8276a5
Merge "Fix debuggerd issues." into lmp-mr1-dev
2014-11-03 19:21:30 +00:00
Nick Kralevich
019a5f5461
am 3e053140: Fix mac build
...
* commit '3e0531402601b473bca94c36242990f7c52b4b9c':
Fix mac build
2014-11-03 18:25:38 +00:00
Nick Kralevich
3e05314026
Fix mac build
...
"errno.h" doesn't get included on mac so we need to do it explicitely.
system/core/libnativebridge/tests/CodeCacheExists_test.cpp:30:15: error:
use of undeclared identifier 'ENOENT'
ASSERT_EQ(ENOENT, errno);
(cherry picked from commit bcd1a834d4
2014-11-03 18:15:37 +00:00
Dmitriy Ivanov
e4d7eaab97
am 359d58dc: resolved conflicts for merge of cb8c583d to stage-aosp-master
...
* commit '359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5':
Fix ps <process name>
2014-11-03 17:38:04 +00:00
Stuart Wells
3410d33dc4
Add razer usb vid for future use with adb
...
Change-Id: I6b76c297de900da050473b764517cfd15c64b838
Signed-off-by: Stuart Wells <stuart.wells@razerzone.com>
2014-11-03 09:32:30 -08:00
Dmitriy Ivanov
359d58dc0f
resolved conflicts for merge of cb8c583d to stage-aosp-master
...
Change-Id: I3a75fda571896ad42e5a2b9499e156e9449d23ed
2014-11-03 09:27:47 -08:00
Dmitriy Ivanov
cb8c583d49
Merge "Fix ps <process name>"
2014-11-03 16:13:30 +00:00
Dmitriy Ivanov
65267bcc27
Fix ps <process name>
...
Use /proc/pid/cmdline instead of /proc/pid/stat
to filter process by name.
Bug: 8638853
Change-Id: I469f55186e0d8b93311438cc8a1d0f73834f3fb5
2014-11-03 01:28:31 -08:00
Christopher Ferris
84ddb34a3a
Fix debuggerd issues.
...
- Fix a problem where a tid exits before the attach completes, and it
causes debuggerd to self terminate.
- Fix a problem where sibling tid dumps do not properly wait for the tid
to get signalled.
Bug: 17800180
Bug: 12567315
Change-Id: Ic3cd619cc2c72402f9a45f14abeed4721b50d64d
2014-11-02 23:36:15 -08:00
Nick Kralevich
1935663248
am 24dfaac4: am c6dead70: Merge "maybe fix mac build"
...
* commit '24dfaac494de3a31e1cd106becc2b2ad38e13bbe':
maybe fix mac build
2014-11-02 14:32:19 +00:00
Nick Kralevich
24dfaac494
am c6dead70: Merge "maybe fix mac build"
...
* commit 'c6dead707de7c03bd9759b61143dd33cb1435cbc':
maybe fix mac build
2014-11-02 14:25:08 +00:00
Nick Kralevich
c6dead707d
Merge "maybe fix mac build"
2014-11-02 14:16:20 +00:00
Nick Kralevich
bcd1a834d4
maybe fix mac build
...
system/core/libnativebridge/tests/CodeCacheExists_test.cpp:30:15: error: use of undeclared identifier 'ENOENT'
ASSERT_EQ(ENOENT, errno);
Change-Id: I188074b878a7ec3955a9f4b5dc7d1bfc56e2ccbc
2014-11-02 06:13:53 -08:00
Sami Tolvanen
7a59c852c2
am 4cafe2ff: Fix verity on system partitions larger than 2G
...
* commit '4cafe2ff89b49329e0e880900195d8e061bd3750':
Fix verity on system partitions larger than 2G
2014-10-31 16:10:58 +00:00
Ian Rogers
cb603b0bae
am 8dac3559: am b968d5c8: Merge "Add shared library version of libziparchive."
...
* commit '8dac3559dd61bb428db401dc7a7e69bd85943394':
Add shared library version of libziparchive.
2014-10-30 18:11:25 +00:00
Ian Rogers
8dac3559dd
am b968d5c8: Merge "Add shared library version of libziparchive."
...
* commit 'b968d5c8468c9b0707f88f773fae16074e9018cf':
Add shared library version of libziparchive.
2014-10-30 18:08:17 +00:00
Ian Rogers
b968d5c846
Merge "Add shared library version of libziparchive."
2014-10-30 18:05:55 +00:00
Ian Rogers
40ac96c72c
Add shared library version of libziparchive.
...
Change-Id: I9abded3bbff0e7976b1849c73e6978dd10ca84cd
2014-10-30 09:53:38 -07:00
Aristidis Papaioannou
12e12f7101
am ffb60ce6: am 91b76d7d: Merge "Made suffix length of rotated logcat files constant."
...
* commit 'ffb60ce6b343535c46f45eb5a4d83d69e170e316':
Made suffix length of rotated logcat files constant.
2014-10-29 20:41:58 +00:00
Calin Juravle
792e269127
resolved conflicts for merge of 7a1abfe3 to lmp-mr1-dev-plus-aosp
...
Change-Id: Ie5db9f745e01bd24faa317af0cd8874e1099ebdf
2014-10-29 19:51:04 +00:00
Sami Tolvanen
4cafe2ff89
Fix verity on system partitions larger than 2G
...
If the system partition is larger than 2G, the device fails to read
verity metadata, because fseek accepts only a 32-bit signed offset.
Switch from fseek to lseek64 to allow seeking using a 64-bit offset,
which solves the problem. At the same time, move away from stdio in
the function.
Bug: 17705619
Change-Id: I226320498dcb750ec6cde84411c7fe0774c9cab7
2014-10-29 11:06:47 -07:00
Narayan Kamath
7007477391
am 182f33db: am 8cf2ce10: Merge "Don\'t allow SUPPORTED_ABIs to be set by the native bridge."
...
* commit '182f33db82641a7e5cc2bda2363204ad74d149e4':
Don't allow SUPPORTED_ABIs to be set by the native bridge.
2014-10-29 17:46:51 +00:00
Calin Juravle
83c29aea2f
resolved conflicts for merge of 4de4e6de to lmp-mr1-dev-plus-aosp
...
Change-Id: Ie5c1c814ccd819a592d834879173edb8af15a52d
2014-10-29 17:32:31 +00:00
