Commit graph

24114 commits

Author SHA1 Message Date
Colin Cross
299df0bf01 Merge "Fix warnings in system/ headers"
am: d7f60fd871

Change-Id: I616548e002f517fe9f85b49aef9d9b6a5548127e
2016-09-22 08:21:43 +00:00
Josh Gao
72c679d6d0 Merge "adb: kill adb_mutex_t, adb_cond_t."
am: 7e4d1db957

Change-Id: I3e10b6e3039e3aeb966f8ca27df69b61fa8aa0cc
2016-09-22 08:21:30 +00:00
Ajay Panicker
f924c252bd Merge "Remove net_bt_stack group and replace it with bluetooth"
am: 7875407bb7

Change-Id: Idd864e20abbe5d9394c63e92ab8a8ac2b020c2e7
2016-09-22 08:09:39 +00:00
Treehugger Robot
d7f60fd871 Merge "Fix warnings in system/ headers" 2016-09-22 02:46:51 +00:00
Treehugger Robot
7e4d1db957 Merge "adb: kill adb_mutex_t, adb_cond_t." 2016-09-22 02:15:00 +00:00
Ajay Panicker
7875407bb7 Merge "Remove net_bt_stack group and replace it with bluetooth" 2016-09-22 01:32:34 +00:00
Colin Cross
a802e570b3 Merge "Hide warning in cutils/trace.h"
am: 5cf3db6d2b

Change-Id: Ie32731764880823560d79aa6cbcc17faf5cd5bf8
2016-09-22 00:55:11 +00:00
Colin Cross
9eb3592e62 Merge "Hide gnu extension warnings in log/log.h"
am: 21049e5c91

Change-Id: Ie25019ffacd234d06e46d40547858009d8341fa3
2016-09-22 00:54:58 +00:00
Colin Cross
7c7990e6fd Fix warnings in system/ headers
system/core/include is included in the global include path using
-isystem, which hides all warnings.  Fix warnings in
system/core/include/system in preparation for moving from -isystem to -I.

- Fix invalid doxygen syntax in graphics.h
- Use a pragma to hide a C99 extension warning on the flexible length
  array in graphics.h
- Make static functions in radio.h static inline
- Fix size_t printf and size_t vs. ssize_t comparision in qemu_pipe.h
- Fix old style cast in window.h

Test: m -j native
Bug: 31492149
Change-Id: I857f289e4c8e303494831873282bbb69de155c10
2016-09-21 17:46:59 -07:00
Colin Cross
5cf3db6d2b Merge "Hide warning in cutils/trace.h" 2016-09-22 00:46:13 +00:00
Colin Cross
9993e799f1 Hide warning in cutils/trace.h
system/core/include is included in the global include path using
-isystem, which hides all warnings.  cutils/trace.h has an ignored
return value warning, move the implementation to trace-dev.c so it
doesn't cause warnings in every module that includes it in preparation
for moving from -isystem to -I.

Test: m -j native
Bug: 31492149
Change-Id: If8b3fe13059c9e59c2d5208294d427d84fa6e588
2016-09-21 17:45:31 -07:00
Colin Cross
21049e5c91 Merge "Hide gnu extension warnings in log/log.h" 2016-09-22 00:45:02 +00:00
Josh Gao
0cd3ae1c28 adb: kill adb_mutex_t, adb_cond_t.
Now that we have support for std::mutex and std::condition_variable on
Windows, remove our mutex compatibility layer in favor of the C++ one.

Bug: http://b/31653591
Test: mma && $ANDROID_HOST_OUT/nativetest64/adb_test/adb_test && \
      python test_adb.py && python test_device.py
      (also on Windows)

Change-Id: I5b7ed9c45cc2a32edcf4e77b56dc28e441f15f34
2016-09-21 17:22:22 -07:00
Josh Gao
67ed583564 Merge "adb: parse tcp socket specs with base::ParseNetAddress."
am: efee71c2de

Change-Id: I911b1bed18e1d1d55c585d78479a85d4d8ba2875
2016-09-21 20:28:57 +00:00
Josh Gao
efee71c2de Merge "adb: parse tcp socket specs with base::ParseNetAddress." 2016-09-21 20:26:36 +00:00
Philip P. Moltmann
775a97fa18 Merge "usb-bulk-transfer: Clarify sign-iy-ness of param"
am: b721c97ec9

Change-Id: I03ab47bbea13d9e01272746560291ea133845804
2016-09-21 18:34:35 +00:00
Philip P. Moltmann
b721c97ec9 Merge "usb-bulk-transfer: Clarify sign-iy-ness of param" 2016-09-21 18:30:58 +00:00
Philip P. Moltmann
9879bb2ba2 usb-bulk-transfer: Clarify sign-iy-ness of param
Parameter is implicily converted to unsigned when assigned to the struct,
so make sure users are aware of this.

Test: compiled
Change-Id: I25ca6b24591497aa4e7ce8db262ce1099c2b7b09
2016-09-21 15:51:35 +00:00
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
Josh Gao
1099215e30 adb: parse tcp socket specs with base::ParseNetAddress.
libbase already has IPv6-aware address parsing, so use it instead of
adb's handrolled IPv4-only parsing.

Bug: http://b/31537253
Change-Id: I4e9ce56b55d7d02787c0fa67b724490bf49ce479
Test: mma && adb start-server && \
      adb -L 'tcp:[::ffff:127.0.0.1]:5037' devices && \
      adb -L 'tcp:localhost:5037' devices && \
      adb -L 'tcp:127.0.0.1:5037' devices && \
      adb -L 'tcp:5037' devices && \
      $ANDROID_HOST_OUT/nativetest64/adb_test/adb_test
2016-09-20 13:55:43 -07:00
Ajay Panicker
604208e957 Remove net_bt_stack group and replace it with bluetooth
Bug: 31549206
Change-Id: I667963e5f9fd1a5dc9ad74378b318e3b782e6883
2016-09-20 12:01:33 -07: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
Colin Cross
412ad0dad8 Hide gnu extension warnings in log/log.h
system/core/include is included in the global include path using
-isystem, which hides all warnings.  Fix warnings in log/log.h
in preparation for moving from -isystem to -I.

log/log.h uses gnu extensions for zero-argument variadic macro token
pasting, which clang warns about with -Weverything.  Hide the warnings
using pragmas.

Test: m -j native
Bug: 31492149
Change-Id: Ib2113f877d811a6ecc0e91c035640b506f04bd86
2016-09-16 11:13:20 -07: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