Elliott Hughes
b777eacc87
am 1da681ca: Merge "bionic\'s struct stat is now POSIX-compliant."
...
* commit '1da681ca4d3d2b5973d364e80f7a5db47d1240c1':
bionic's struct stat is now POSIX-compliant.
2014-11-10 22:14:42 +00:00
Elliott Hughes
1da681ca4d
Merge "bionic's struct stat is now POSIX-compliant."
2014-11-10 19:07:15 +00:00
Elliott Hughes
f1df854e58
bionic's struct stat is now POSIX-compliant.
...
Right now we still have the kernel names, but they're only there by
"virtue" of macro namespace pollution, so I'd like to get rid of them.
Bug: 18298106
Change-Id: Ifed0b3a9238c79a99d8a2b62e0f5897c50a725d1
2014-11-10 11:03:38 -08:00
Nick Kralevich
d6520cf958
am 65a83bdf: Merge "Reserve some AIDs for OEMs"
...
* commit '65a83bdf2ea1643449294a23a450e5a8a5b5058c':
Reserve some AIDs for OEMs
2014-11-10 17:51:34 +00:00
Nick Kralevich
65a83bdf2e
Merge "Reserve some AIDs for OEMs"
2014-11-10 17:42:58 +00:00
Johan Redestig
60ac6364ec
Reserve some AIDs for OEMs
...
OEMs frequently add some AIDs on their own. Reserve some range
for them to use.
Change-Id: I3c729c889c9bd3e105ae4f6fb0c04a42a10eb25c
2014-11-10 08:14:21 +01:00
Stephen Hines
96031a9985
am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include."
...
* commit 'f02c7972560bc512552830c8110d026136a3a87f':
Move winsock2.h in front of a potential windows.h include.
2014-11-09 09:03:31 +00:00
Dan Albert
7c7a782cad
am aaa920d7: Merge "Make Unicode.h use types that match libc++."
...
* commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead':
Make Unicode.h use types that match libc++.
2014-11-09 09:03:30 +00:00
Stephen Hines
f02c797256
Merge "Move winsock2.h in front of a potential windows.h include."
2014-11-09 07:24:43 +00:00
Stephen Hines
7e34121e39
Move winsock2.h in front of a potential windows.h include.
...
Files that included FileMap.h (possibly transitively), before including
ByteOrder.h (which pulls in winsock2.h directly), will experience a
compiler warning/error from the latest mingw headers. This happens because
the headers require that winsock2.h come before windows.h in all cases.
The simplest (and most error-proof) fix for now is to include winsock2.h
before this use of windows.h.
Change-Id: I33069e4c9962d9820d0ea5976554f89d7ff6307c
2014-11-08 19:30:05 -08:00
Dan Albert
aaa920d796
Merge "Make Unicode.h use types that match libc++."
2014-11-09 02:09:35 +00:00
Dan Albert
2f5ad5ff86
Make Unicode.h use types that match libc++.
...
libc++ also defines these types for pre-C++11, and the two definitions
need to match to avoid redefinition errors.
Bug: 18300613
Change-Id: I1e9198d39f7c470f37bc6edba2dca2d499f54c9b
2014-11-08 20:22:30 +00:00
Elliott Hughes
aeac9cd1b3
am 85507404: Merge "Remove dead code."
...
* commit '855074043144e74156972e7a3416808dc6696452':
Remove dead code.
2014-11-08 20:11:53 +00:00
Elliott Hughes
8550740431
Merge "Remove dead code."
2014-11-08 20:05:34 +00:00
Elliott Hughes
9a092dd373
Remove dead code.
...
__APPLE__ => HAVE_FUNOPEN.
Change-Id: I191cccd9b75020ffbb3281283ce1f1b7abc15d22
2014-11-08 11:32:07 -08:00
Christopher Ferris
419807a3d3
am 0eabf64c: Fix adb/fastboot windows compilations.
...
* commit '0eabf64ce0c649e4ef691ae1b70cb20d599dd429':
Fix adb/fastboot windows compilations.
2014-11-07 04:04:07 +00:00
Christopher Ferris
0eabf64ce0
Fix adb/fastboot windows compilations.
...
Many of the windows files where not including stdlib.h even though they
are using malloc/free calls.
Bug: 18283958
(cherry picked from commit ae7bf0959b
2014-11-06 18:32:39 -08:00
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
