Josh Gao
8c9ecb9c2c
Merge "base: rename unique_fd::clear() to unique_fd::reset()."
...
am: 14d3a1ac9d
Change-Id: Ic00aaca61c8e9eb68c30de00b825fc73d8b3cace
2016-09-21 01:07:18 +00:00
Josh Gao
14d3a1ac9d
Merge "base: rename unique_fd::clear() to unique_fd::reset()."
2016-09-21 01:03:06 +00:00
Colin Cross
6f5edc78d8
Merge "Fix warnings in libziparchive"
...
am: 91811d2d34
Change-Id: I80141c999b90da513a6a31113398753fad623fba
2016-09-20 18:34:17 +00:00
Treehugger Robot
91811d2d34
Merge "Fix warnings in libziparchive"
2016-09-20 18:26:25 +00:00
Colin Cross
7c6c7f0b9f
Fix warnings in libziparchive
...
system/core/include is included in the global include path using
-isystem, which hides all warnings. zlib.h is included through
system/core/include/ziparchive/zip_archive.h, which was hiding warnings
in it. Use a #pragma around the call to deflateInit2, it is a macro
that expands to an old-style cast, in preparation for moving from
-isystem to -I. Also move the ZipString constructor to zip_archive.cc
so it can assert on the length of the string parameter and fix an
implicit conversion from size_t to uint16_t.
Test: m -j native
Bug: 31492149
Change-Id: I74cdad7fe9c723859b5cfbea73c8f27d9d9ca265
2016-09-20 09:23:47 -07:00
Tao Wu
bcc419edad
Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT"
...
am: 4159568548
Change-Id: I8f2b4b1a5914642790e18e58d376ffcd37311d1f
2016-09-19 20:53:48 +00:00
Treehugger Robot
4159568548
Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT"
2016-09-19 20:35:11 +00:00
Ajay Panicker
3a9a16ee79
Merge "Allow bluetooth service to access bluetooth directory and add /logs (1/6)"
...
am: 2c2a3f7a95
Change-Id: I87a803330ab1b3d34f96a1163026bc5e23eb5101
2016-09-19 20:10:59 +00:00
Ajay Panicker
2c2a3f7a95
Merge "Allow bluetooth service to access bluetooth directory and add /logs (1/6)"
2016-09-19 19:57:23 +00:00
Josh Gao
5d1b1a8b91
base: rename unique_fd::clear() to unique_fd::reset().
...
unique_fd is modeled on unique_ptr, so make this consistent.
Test: m checkbuild
Change-Id: Ia6a77095dc18746fbb432e96bb8dccfc049c57f6
2016-09-19 11:24:58 -07:00
Ajay Panicker
59d6a8cf8a
Allow bluetooth service to access bluetooth directory and add /logs (1/6)
...
Bug: 31466840
Change-Id: I2c2766a2366600def81708d97cf3f3f13e0eb655
2016-09-19 17:50:56 +00:00
Elliott Hughes
c190d472ef
Merge "Move libusbhost's headers into libusbhost."
...
am: 36b88ce975
Change-Id: I1fe6608f6414f995dc45b4ed157278bcc0441eaf
2016-09-17 01:38:40 +00:00
Elliott Hughes
d141edfb3c
Move libusbhost's headers into libusbhost.
...
am: e0a7c773ed
Change-Id: Ia6b0131c9405650a8c9934a7010c7723f028f6dd
2016-09-17 01:38:39 +00:00
Treehugger Robot
36b88ce975
Merge "Move libusbhost's headers into libusbhost."
2016-09-17 01:33:11 +00:00
Tao Wu
135f4ab3dd
Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT
...
BUG: 31549442
Test: export ANDROID_ADB_SERVER_PORT=12345;killall adb;adb devices
Change-Id: If2bfaf44c6567af16cae0d4def2f11be39c2d437
Signed-off-by: Tao Wu <lepton@google.com>
2016-09-16 17:13:48 -07:00
Pirama Arumuga Nainar
88c992f080
Merge "Remove mutex.h and its uses."
...
am: 33414a8b5f
Change-Id: I84321313ddc6f79c6a8c48a1479ff76235067624
2016-09-16 23:08:11 +00:00
Pirama Arumuga Nainar
33414a8b5f
Merge "Remove mutex.h and its uses."
2016-09-16 22:59:59 +00:00
Pirama Arumuga Nainar
70f281ae36
Remove mutex.h and its uses.
...
mutex.h is now available as a part of MinGW itself.
Test: Successful build
Change-Id: I036ee37600a39130d6fbf293398585cfc58209ca
2016-09-16 15:58:00 -07:00
Pirama Arumuga Nainar
331ec060ca
Merge "Use <condition_variable> and <mutex.h> from MinGW"
...
am: a3d7b240f1
Change-Id: I319a164694fe67a008915249811dc39567184d08
2016-09-16 22:15:21 +00:00
Pirama Arumuga Nainar
a3d7b240f1
Merge "Use <condition_variable> and <mutex.h> from MinGW"
2016-09-16 21:59:35 +00:00
Elliott Hughes
014d9df418
Merge "Fix debuggerd argument parsing."
...
am: 99ed65234c
Change-Id: I8899fc35a450eb34425db5eb0b307f4fa1354338
2016-09-16 21:10:48 +00:00
Treehugger Robot
99ed65234c
Merge "Fix debuggerd argument parsing."
2016-09-16 21:02:40 +00:00
Colin Cross
6f292bcab9
Merge "Fix warnings in cutils/atomic.h"
...
am: 5e093f367c
Change-Id: I32d4a5cae0e61ac7ae30e0bd9b1b81e409009fd0
2016-09-16 19:45:42 +00:00
Treehugger Robot
5e093f367c
Merge "Fix warnings in cutils/atomic.h"
2016-09-16 19:31:10 +00:00
Elliott Hughes
97dd4017fb
Merge "Move libbinderwrapper's headers into libbinderwrapper."
...
am: 4127ccbda5
Change-Id: Ia10736bb3e6eac5e47b02b8a2491c367874759e3
2016-09-16 17:48:53 +00:00
Elliott Hughes
c5cc029993
Move libbinderwrapper's headers into libbinderwrapper.
...
am: 40104501fa
Change-Id: Icc06adc4c044cffec1738ae8f21c4f1a39840d87
2016-09-16 17:48:53 +00:00
Elliott Hughes
e0a7c773ed
Move libusbhost's headers into libusbhost.
...
Change-Id: Ic5ff65bd6456ea3cc92e0c8f9d7a6f499e58dbfc
2016-09-16 10:43:56 -07:00
Treehugger Robot
4127ccbda5
Merge "Move libbinderwrapper's headers into libbinderwrapper."
2016-09-16 17:34:03 +00:00
Elliott Hughes
40104501fa
Move libbinderwrapper's headers into libbinderwrapper.
...
It was probably the LOCAL_EXPORT_C_INCLUDE_DIRS that made me miss this on the
original code review...
Change-Id: I55bc0b0698604338cd206bf5f336798929b6d8f9
2016-09-16 09:02:47 -07:00
Colin Cross
ec69c05463
Fix warnings in cutils/atomic.h
...
system/core/include is included in the global include path using
-isystem, which hides all warnings. Fix warnings in cutils/atomic.h in
preparation for moving from -isystem to -I.
Test: m -j native
Bug: 31492149
Change-Id: I2a212f192309090a16d507e9ab6acf0fd7cac02d
2016-09-15 19:22:32 -07:00
Elliott Hughes
9048608db1
Fix debuggerd argument parsing.
...
We weren't detecting incorrect input before. Also clean up the help output
to match the style of all the toybox output. Also flush stdout so that we
don't report failure before even saying that we're going to try to contact
debuggerd...
Change-Id: I9e4bfa878f270fe46c3c210c7a7138959a108d67
2016-09-15 17:08:33 -07:00
Josh Gao
ba4a61348d
Merge changes I0a00b3d4,I19cb0694
...
am: 67855d8454
Change-Id: I4d98ea47da41b1d8543a29a8e3539d73389067c6
2016-09-15 02:27:33 +00:00
Josh Gao
30ecda227c
adb: let adb push
follow symlinks.
...
am: 94dc19ff57
Change-Id: I408ebb7b3091e67bd7025b3a6404f57c7f3af377
2016-09-15 02:27:33 +00:00
Josh Gao
493c215aa2
base: add parameter that controls O_NOFOLLOW in file functions.
...
am: ffabc9651f
Change-Id: Ied9fe3e37a325c185319b4b915e1f0fb9473af7d
2016-09-15 02:27:27 +00:00
Treehugger Robot
67855d8454
Merge changes I0a00b3d4,I19cb0694
...
* changes:
adb: let `adb push` follow symlinks.
base: add parameter that controls O_NOFOLLOW in file functions.
2016-09-15 02:19:14 +00:00
Josh Gao
94dc19ff57
adb: let adb push
follow symlinks.
...
Bug: http://b/31491920
Test: touch foo; ln -s foo bar; adb push bar /data/local/tmp
Test: python test_device.py
Change-Id: I0a00b3d49fdf7206e27d66ac110b56e22449a1ad
2016-09-14 17:08:22 -07:00
Josh Gao
ffabc9651f
base: add parameter that controls O_NOFOLLOW in file functions.
...
Bug: http://b/31491920
Change-Id: I19cb06941d87c0180ccab8bb2d85e57338811624
Test: m
2016-09-14 17:08:22 -07:00
Josh Gao
8fc46f7c6c
Merge "Fix darwin build break."
...
am: 1a73e9b7e2
Change-Id: Ie00c1ae1f8431659606adaaf78deffc25fb85118
2016-09-14 21:11:02 +00:00
Josh Gao
1a73e9b7e2
Merge "Fix darwin build break."
2016-09-14 21:02:01 +00:00
Josh Gao
c95afaa20b
Fix darwin build break.
...
Bug: http://b/31468413
Change-Id: I12fdf0977213eefc7043939964070025a672881a
2016-09-14 13:54:45 -07:00
Josh Gao
173c1fefe6
Merge changes Ie15fcb8f,I0a895911
...
am: c9c555b8dd
Change-Id: I7d1a7b3b9c14853796d0e601346fd93af71f4c60
2016-09-14 20:23:36 +00:00
Josh Gao
63b499d93d
base: add quick_exit emulation.
...
am: 0c44256ae4
Change-Id: I28ebce03b898435b2ede2bace01778c2ee606a18
2016-09-14 20:23:35 +00:00
Josh Gao
c55eba3a6e
base: extract mutex.h from logging.cpp.
...
am: 63bdcb57aa
Change-Id: I93575399e1dec5e51a897904aaa38997360ddc2f
2016-09-14 20:23:29 +00:00
Treehugger Robot
c9c555b8dd
Merge changes Ie15fcb8f,I0a895911
...
* changes:
base: add quick_exit emulation.
base: extract mutex.h from logging.cpp.
2016-09-14 20:14:53 +00:00
Josh Gao
0c44256ae4
base: add quick_exit emulation.
...
Bug: http://b/31468413
Change-Id: Ie15fcb8ff0613d01a0eb7437a2cb37283aa52bab
Test: mma, libbase_test on Linux/Windows
2016-09-13 17:54:50 -07:00
Andreas Gampe
8c42c0ba1d
Merge "Base: Fix dangling-else in CHECK_STROP"
...
am: ad81a1d94a
Change-Id: Iae70ed275d5f1c0cab2b5626284079c8a08c9ac4
2016-09-13 23:19:09 +00:00
Treehugger Robot
ad81a1d94a
Merge "Base: Fix dangling-else in CHECK_STROP"
2016-09-13 23:09:37 +00:00
Josh Gao
63bdcb57aa
base: extract mutex.h from logging.cpp.
...
Extract the Windows-specific mutex implementation from logging.cpp.
Bug: http://b/31468413
Change-Id: I0a895911ec6d815b8011b09d55209b64bbf9a70e
Test: mma
2016-09-13 15:59:46 -07:00
Andreas Gampe
d8f26e2ac9
Base: Fix dangling-else in CHECK_STROP
...
Follow-up to commit 2527628eda
.
Bug: 26962895
Bug: 31338270
Test: m
Test: mmma system/core/base && $ANDROID_HOST_OUT/nativetest64/libbase_test/libbase_test64
Change-Id: Ifd71314e146ebf3957cc053ee95ef85002c909b4
2016-09-13 14:16:37 -07:00
TuHailong
a6d17f2513
Merge "Fix zygote energy-aware scheduler tuning bug"
...
am: de029a894a
Change-Id: I7aeefcd7fc238e10ca74a4c101573eea9b51125f
2016-09-13 19:20:49 +00:00