Commit graph

11437 commits

Author SHA1 Message Date
Elliott Hughes
7da97265e5 am ab0d5425: Merge "fastboot: Support USB 3.x SuperSpeed devices on Linux"
* commit 'ab0d542506b5fdbcc431ba2606248471d22322ba':
  fastboot: Support USB 3.x SuperSpeed devices on Linux
2014-12-09 14:40:58 +00:00
Elliott Hughes
c6e34ed6f9 am dbb7c46d: Merge "ADB on linux: Handle USB SuperSpeed extra Descriptors"
* commit 'dbb7c46d686e55aabd52a8e4c5494768c8955a2f':
  ADB on linux: Handle USB SuperSpeed extra Descriptors
2014-12-09 14:40:57 +00:00
Elliott Hughes
78b98d8807 am a5e9b065: Merge "adb: enable superspeed support"
* commit 'a5e9b065efcd2ee91a7a9bee4a44d85c5d30cf13':
  adb: enable superspeed support
2014-12-09 13:18:46 +00:00
Elliott Hughes
9ebc6c6b60 am 51248395: Merge "Clean up adb/Android.mk"
* commit '51248395626ceb9f54016e78ebb4adee17b290c1':
  Clean up adb/Android.mk
2014-12-09 11:25:32 +00:00
Narayan Kamath
a45020bbcd am 3f5bba53: Merge "Reject zip archives whose entry names are not valid UTF-8."
* commit '3f5bba537ee278212ef29c6b608c87e6bc06da5f':
  Reject zip archives whose entry names are not valid UTF-8.
2014-12-09 11:24:50 +00:00
Elliott Hughes
ab0d542506 Merge "fastboot: Support USB 3.x SuperSpeed devices on Linux" 2014-12-08 23:04:58 +00:00
Elliott Hughes
dbb7c46d68 Merge "ADB on linux: Handle USB SuperSpeed extra Descriptors" 2014-12-08 22:35:41 +00:00
Elliott Hughes
a5e9b065ef Merge "adb: enable superspeed support" 2014-12-08 19:23:30 +00:00
Elliott Hughes
5124839562 Merge "Clean up adb/Android.mk" 2014-12-08 18:02:30 +00:00
Zhuang Jin Can
d6ee9f26a5 adb: enable superspeed support
Change-Id: I5a350bfa5641365d7a0939d89c6f477c335e948a
Signed-off-by: Zhuang Jin Can <jin.can.zhuang@intel.com>
Signed-off-by: Robert Chiras <robert.chiras@intel.com>
2014-12-08 16:31:18 +02:00
Narayan Kamath
3f5bba537e Merge "Reject zip archives whose entry names are not valid UTF-8." 2014-12-08 13:08:34 +00:00
Narayan Kamath
044bc8ee89 Reject zip archives whose entry names are not valid UTF-8.
bug: 18584205
Change-Id: Iaf3e8211dab6a1e3923f7fee6ea7fc693972dba3
2014-12-08 12:25:05 +00:00
Trevor Drake
b79a2d55f7 Clean up adb/Android.mk
Removed redundant LOCAL_C_INCLUDES.
Switch from using libunz to libz

Change-Id: Ic90c582fa56453bbac09561158e73f240dd47503
2014-12-07 15:13:29 +00:00
Elliott Hughes
6d587381de am afe3d271: Merge "Clean up libutils Android.mk"
* commit 'afe3d2718b0d87ad7ebc6299c2aaa44a5178ae9d':
  Clean up libutils Android.mk
2014-12-06 19:36:44 +00:00
Elliott Hughes
afe3d2718b Merge "Clean up libutils Android.mk" 2014-12-06 19:24:07 +00:00
Trevor Drake
dabdbf9a6e Clean up libutils Android.mk
Removed LOCAL_C_INCLUDES as the external/zlib headers are no longer
referenced by anything in libutils.

Removed unused host_commonLdlibs build variable. This was referenced
by the lib64utils host target which was removed in commit 03cc1f747

Tested compiling some of the projects that make use of libcutils
using a clean out dir with the folllowing targets

aosp_arm-eng : make -j16 logd dexdump
aosp-flouder-userdebug : make -j16 keystore vold libjavacore logd
aosp-x86_64-eng : make -j16 keystore vold libjavacore logd dexdump

Change-Id: I663e52bbf28dde27866dad9429bf95ada6b594a5
2014-12-06 09:27:19 +00:00
Elliott Hughes
60b317dff8 am 3579f043: Merge "Clean up libziparchive Android.mk"
* commit '3579f043fbca8ecf7fefd5cc1889639d356ddd4b':
  Clean up libziparchive Android.mk
2014-12-06 04:40:29 +00:00
Elliott Hughes
3579f043fb Merge "Clean up libziparchive Android.mk" 2014-12-06 04:21:11 +00:00
Trevor Drake
f73237346e Clean up libziparchive Android.mk
Removed LOCAL_C_INCLUDES which are no longer necessary as zlib
now uses the LOCAL_EXPORT_C_INCLUDE_DIRS mechanism.

Removed a couple of redundant LOCAL_MODULE entries

Tested compiling some of the projects that make use of libziparchive
and libziparchive-host using a clean out dir with aosp_flounder-userdebug
aosp_arm-eng targets

make -j3 libziparchive libandroidfw libartd libart libjavacore libjavacoretests aapt

Change-Id: I2988f1b3a62d1df2b5eada4ad39a9246ac1184fb
2014-12-06 00:07:05 +00:00
Mark Salyzyn
103edfa217 am 862e4d5b: Merge "logd: auditd remove logDmesg method"
* commit '862e4d5b98f8777b7a968e60e838a9d9bab5445c':
  logd: auditd remove logDmesg method
2014-12-05 21:27:25 +00:00
Mark Salyzyn
862e4d5b98 Merge "logd: auditd remove logDmesg method" 2014-12-05 21:14:28 +00:00
Mark Salyzyn
eb06de716b logd: auditd remove logDmesg method
- logDmesg method consumes considerable memory
  resources (typically 128KB depending on kernel)
- In the future (eg: klogd, syslogd) there may be need to
  feed multiple logs or threads with the retrieved data.
- By moving the actions of logDmesg into the mainline that
  instantiates the thread objects, we can leverage a single
  allocation of the the kernel log allocation.
- logDmesg (private) is replaced with log (public) which
  has a more useful and descriptive purpose for the class.

Change-Id: Ie2dd0370661493c1e596a7e486904a0e8caab9ff
2014-12-05 20:56:44 +00:00
Mark Salyzyn
1b56ab50e0 am e0a5ab5d: Merge "logcat: use liblog to determine -b all list"
* commit 'e0a5ab5d56a3488377262e8fd14d3a90b7d74696':
  logcat: use liblog to determine -b all list
2014-12-05 20:25:40 +00:00
Mark Salyzyn
e0a5ab5d56 Merge "logcat: use liblog to determine -b all list" 2014-12-05 20:14:42 +00:00
Mark Salyzyn
d0bd1b1b58 logcat: use liblog to determine -b all list
- This is done to prevent the administrivia of adjusting
  logcat sources every time a new log id is added.

Change-Id: I0074afb00694c2c00f6c3a66e58c15691146a6c5
2014-12-05 20:14:30 +00:00
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
Elliott Hughes
023bc0a426 Merge "Fix deadlocks." 2014-12-03 18:38:05 +00:00