Commit graph

11513 commits

Author SHA1 Message Date
Jack Pham
1c02213e89 fastboot: Support USB 3.x SuperSpeed devices on Linux
When enumerating USB 3.x devices, an extra 6-byte SuperSpeed
companion descriptor follows each standard endpoint descriptor.
The loop parsing the descriptors will stumble if they're not
handled. Since they're not needed once the bulk endpoints are
identified, we can simply skip over them.

Change-Id: I7e73bcf9135f23c3059cd7c55b432557b28cb6ef
2014-12-05 12:11:20 -08:00
Elliott Hughes
34c8d309b0 am a48decd4: Merge "Clean up libzipfile Android.mk"
* commit 'a48decd47b6ef8559418c7d1a68739c5ef50aaf8':
  Clean up libzipfile Android.mk
2014-12-05 19:16:36 +00:00
Elliott Hughes
a48decd47b Merge "Clean up libzipfile Android.mk" 2014-12-05 19:04:48 +00:00
Elliott Hughes
45765c74fc am e19e3fc7: Merge "Lose kill to toybox."
* commit 'e19e3fc72d230809d75fff6d7b246a2cd2525029':
  Lose kill to toybox.
2014-12-05 16:57:11 +00:00
Elliott Hughes
e19e3fc72d Merge "Lose kill to toybox." 2014-12-05 16:43:04 +00:00
Trevor Drake
d8fc39a2ca Clean up libzipfile Android.mk
Switch to using libz instead of libunz as per the note in
external/zlib/Android.mk.

Removed LOCAL_C_INCLUDES which are no longer necessary as zlib
now uses the LOCAL_EXPORT_C_INCLUDE_DIRS mechanism.

Tested compiling the projects that make use of libzipfile using
a clean out dir with both aosp_flounder-userdebug and aosp_arm-eng

make -j16 test_zipfile fastboot adb adbd libSR_Core libsrec_jni

Change-Id: I5fdf34b6c272ae64c406e5b77ab67a5f5e4b5890
2014-12-05 15:59:03 +00:00
Elliott Hughes
049ee390df Lose kill to toybox.
Change-Id: Icca3eb4b78e07eb49b090cc98dc3ca3f5c5ea8a6
2014-12-04 20:08:26 -08:00
Andreas Gampe
df8d6f6eeb am 7f55e82c: Merge "Toolbox: Disable unused-XXX warnings"
* commit '7f55e82cd2673c89d7fc52e076b81f2379a75283':
  Toolbox: Disable unused-XXX warnings
2014-12-05 03:38:15 +00:00
Andreas Gampe
7f55e82cd2 Merge "Toolbox: Disable unused-XXX warnings" 2014-12-05 03:23:41 +00:00
Andreas Gampe
e826877117 Toolbox: Disable unused-XXX warnings
For build-system CFLAGS clean-up, disable warnings locally.

Should be reverted when the code is fixed.

Bug: 18632512
Change-Id: Ia373784ec36d37545a7e50db1df9f8cc37d7bf30
2014-12-04 18:01:26 -08:00
Elliott Hughes
79991acbfc am ba037592: Merge "Lose vmstat to toybox."
* commit 'ba03759264e62d5592688957cb70ffa567356074':
  Lose vmstat to toybox.
2014-12-04 22:57:17 +00:00
Elliott Hughes
1d345ecd95 am 81c23f3c: Merge "Use __arm__ instead of ARCH_ARM."
* commit '81c23f3cfe64fc63bf7e5fadf86d08f44d5306df':
  Use __arm__ instead of ARCH_ARM.
2014-12-04 22:45:15 +00:00
Elliott Hughes
ba03759264 Merge "Lose vmstat to toybox." 2014-12-04 22:42:08 +00:00
Elliott Hughes
da630f38d2 am 8163104b: Merge "Remove dead code."
* commit '8163104b3feb575a321b194a70ecb9873a70b29d':
  Remove dead code.
2014-12-04 22:38:15 +00:00
Badhri Jagan Sridharan
ad32ebecc9 am 97133621: Merge "system: core: fastboot: Increase USB protocol buffer size to 1024"
* commit '971336213a32e5f3841bc22413632e0108f1c9e2':
  system: core: fastboot: Increase USB protocol buffer size to 1024
2014-12-04 22:38:14 +00:00
Elliott Hughes
81c23f3cfe Merge "Use __arm__ instead of ARCH_ARM." 2014-12-04 22:20:16 +00:00
Elliott Hughes
22a40e6a7a Use __arm__ instead of ARCH_ARM.
Change-Id: I777da5757f01d8328d5475e654d56d81dc802655
2014-12-04 14:17:26 -08:00
Elliott Hughes
caaaa27865 am 6855af41: Merge "libpixelflinger should #define __ARM_HAVE_NEON."
* commit '6855af4135c9cd29a42f7c22ca7c394d902faea5':
  libpixelflinger should #define __ARM_HAVE_NEON.
2014-12-04 19:51:25 +00:00
Elliott Hughes
8163104b3f Merge "Remove dead code." 2014-12-04 19:06:48 +00:00
Badhri Jagan Sridharan
971336213a Merge "system: core: fastboot: Increase USB protocol buffer size to 1024" 2014-12-04 18:58:46 +00:00
Elliott Hughes
fa969cd1f9 am 023bc0a4: Merge "Fix deadlocks."
* commit '023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a':
  Fix deadlocks.
2014-12-04 09:22:00 +00:00
Elliott Hughes
d05f1d51ad Remove dead code.
Intel accidentally made this dead code in 2010 with commit
2bef93cc20, and no one's ever noticed.

Since no one noticing for so long implies that it doesn't matter,
let's just kill the supposedly optimized code.

Change-Id: Id5b37056cb8884c20bfe2db362e19b46f02e337d
2014-12-03 19:35:16 -08:00
Elliott Hughes
6855af4135 Merge "libpixelflinger should #define __ARM_HAVE_NEON." 2014-12-04 01:30:05 +00:00
Elliott Hughes
053ca3fc42 libpixelflinger should #define __ARM_HAVE_NEON.
Bug: 18556103
Change-Id: Ife07cf63948f1c248bcde5685cdb6d89c373d988
2014-12-03 17:15:14 -08:00
dcashman
98069027bd Move property_context label handling to libselinux.
Change-Id: I76e2ed95d4e4f8618458e63d30ae82e37d1acf7b
2014-12-03 15:18:40 -08:00
Elliott Hughes
023bc0a426 Merge "Fix deadlocks." 2014-12-03 18:38:05 +00:00
Dan Albert
96bc684124 am bc260206: Merge "Fix build."
* commit 'bc2602068d83b0226a614ed143cebd708c5fabd2':
  Fix build.
2014-11-28 21:08:32 +00:00
Dan Albert
bc2602068d Merge "Fix build." 2014-11-28 20:57:19 +00:00
Dan Albert
fd1c060eaa Fix build.
More UD literals that weren't caught by hammerhead...

Change-Id: I6b0abdeef41d1f40c2fe86843b5149925ff6356e
2014-11-28 12:30:46 -08:00
Elliott Hughes
a03656d884 resolved conflicts for merge of 809965cc to lmp-mr1-dev-plus-aosp
Change-Id: Ifbfe91b16e44b2acd08de48a5cdd2176bd664d0a
2014-11-27 11:31:06 -08:00
Elliott Hughes
809965cc36 Merge "Lose readlink to toybox." 2014-11-27 19:06:18 +00:00
Stephen Hines
fafbd329cb am ba1552bd: Merge "Clarify the strcmp() with the empty string."
* commit 'ba1552bd2438a8a47779ed3d05d5ce15bfb5741c':
  Clarify the strcmp() with the empty string.
2014-11-27 13:54:31 +00:00
Stephen Hines
8d49c8b0bf am f66486ef: Merge "Fix incorrect path name check."
* commit 'f66486ef09bfc53da65ca6b4137c47d583f31356':
  Fix incorrect path name check.
2014-11-27 13:54:24 +00:00
Elliott Hughes
330d892782 am b553a18a: Merge "Lose dmesg to toybox."
* commit 'b553a18a02cd90298716c88d9167f877b63a36b6':
  Lose dmesg to toybox.
2014-11-27 12:01:22 +00:00
Elliott Hughes
0085d948f2 Lose readlink to toybox.
Change-Id: I933542dfdec7693f856d7368ff5661957ccabf74
2014-11-26 15:19:47 -08:00
Stephen Hines
ba1552bd24 Merge "Clarify the strcmp() with the empty string." 2014-11-26 22:58:02 +00:00
Stephen Hines
04f895314d Clarify the strcmp() with the empty string.
Change-Id: Ie246b3c2de3f19b95693f634b0ebd46bdcf3962b
2014-11-26 14:54:43 -08:00
Stephen Hines
f66486ef09 Merge "Fix incorrect path name check." 2014-11-26 22:32:23 +00:00
Stephen Hines
60f21a7f61 Fix incorrect path name check.
This was caught by clang 3.6's -Wpointer-bool-conversion. The device_path
field is a char[256], and thus never NULL. The intention for this code was
to check whether or not there is a named path at all. Checking whether this
is an empty string matches the original intent.

Change-Id: I5ccedc03167e6a457e472089de26130aff7f96e3
2014-11-26 14:30:01 -08:00
Elliott Hughes
b553a18a02 Merge "Lose dmesg to toybox." 2014-11-26 19:37:30 +00:00
Eric Laurent
be7bb9004c am 47f52f24: audio: new stream types
* commit '47f52f247d6d895878b831de448f19b98225515d':
  audio: new stream types
2014-11-26 12:01:50 +00:00
Elliott Hughes
a7ec5f1067 am 50ac7725: Merge "Lose nohup to toybox."
* commit '50ac7725a5f1c195989888277341f22ab54f979b':
  Lose nohup to toybox.
2014-11-26 02:03:41 +00:00
Elliott Hughes
38228a2c10 Lose vmstat to toybox.
Change-Id: Ifcb64292bb147ad592d1a627bb8dbb684f4a27e4
2014-11-25 17:17:17 -08:00
Elliott Hughes
50ac7725a5 Merge "Lose nohup to toybox." 2014-11-26 01:09:43 +00:00
Elliott Hughes
402f7e97d5 Lose nohup to toybox.
Change-Id: I2928534bc70c6c77cdc90b658029567f00e7f6ad
2014-11-25 16:58:53 -08:00
Elliott Hughes
8e8cd0cf7a Lose dmesg to toybox.
Change-Id: I29a6bf5e628e29e9b635fac2b23106220e36d6a3
2014-11-25 16:23:15 -08:00
Elliott Hughes
bbd3b7edd7 am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."
* commit 'c0ac9313e942fb7d3a027cec41904c18d8841521':
  Only Windows doesn't have <sys/uio.h>.
2014-11-25 21:55:37 +00:00
Elliott Hughes
c0ac9313e9 Merge "Only Windows doesn't have <sys/uio.h>." 2014-11-25 21:48:30 +00:00
Elliott Hughes
111e3d3d9c Only Windows doesn't have <sys/uio.h>.
This should probably be in libcutils instead, so code that needs to
care about Windows can use readv/writev.

Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
2014-11-25 13:27:43 -08:00
Elliott Hughes
f11758bb58 am 9c7e5c7c: Merge "Only Win32 doesn\'t have writev."
* commit '9c7e5c7c33607fce4c91e22dcf38237256450b9a':
  Only Win32 doesn't have writev.
2014-11-25 19:58:38 +00:00