Merge commit 'c73d9e43a0c98a87222ef0c8749d6abba06c7778'
* commit 'c73d9e43a0c98a87222ef0c8749d6abba06c7778':
libsysutils: Add multiple client support and fix some bugs
nexus: Implement wifi scanner and fix a lot of bugs
Merge commit '3fd82b8861aa410fab7785074941b459d92220c1'
* commit '3fd82b8861aa410fab7785074941b459d92220c1':
adb: osx: Match devices based on interface subclass and protocol
Enumerating all vendor+product id combinations is not practical.
This modifies the matching algorithm to use the adb interface
subclass/protocol instead (0x42/0x1).
Signed-off-by: Dima Zavin <dima@android.com>
Add a license.
Indent the code.
Add includes for external functions.
Improve function prototypes.
Start adding the correct type to things that are pointers.
Start fixing compiler warnings.
Instead of directly executing the compiled code (which only works on x86 Linux),
write the internal compiler state to stdout. This makes it easier to test whether
or not our refactoring is breaking anything.
Return a zero status on success.
Add error checking for a missing input file.
Merge commit 'b3779558dcfbe99f0b9c1ef796e3728edad25672'
* commit 'b3779558dcfbe99f0b9c1ef796e3728edad25672':
init: Fix some broken code that did not cause problems until switching to gcc 4.4
Merge commit '747baadddb37737b0ecf83f6147a5e3252a34b12'
* commit '747baadddb37737b0ecf83f6147a5e3252a34b12':
libsysutils: New C++ system convenience library
Merge commit '27808271934622e6473d7d664303fa3efb4cd662'
* commit '27808271934622e6473d7d664303fa3efb4cd662':
Make the /dev/qemu_trace device readable and writable by all.
This library contains re-usable classes for common
system level daemons. Initial consumers of this library
are 'nexus' and 'vold2'
Signed-off-by: San Mehat <san@google.com>
Merge commit '770354d7e6cd471daed426fcf04bf7246e7cb18b'
* commit '770354d7e6cd471daed426fcf04bf7246e7cb18b':
init: Fix segfault when log_write() was missing an arg to format.
Merge commit 'feb3d6d8db30f51c560e792ef3d9eca01d9cae9d'
* commit 'feb3d6d8db30f51c560e792ef3d9eca01d9cae9d':
adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too.
* changes:
adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too. While adb is not needed for the simulator, it's handy to have around when you're working with the simulator but need to look at a device.
Merge commit '95ec983887867a117f4ef87073495111aff4a506'
* commit '95ec983887867a117f4ef87073495111aff4a506':
fastboot: Update the help message with -b argument
Add the --base flag to mkbootimg and -b flag to fastboot, to allow
the default kernel base address (0x10000000) to be changed.
Signed-off-by: Brian Swetland <swetland@google.com>