Commit graph

12229 commits

Author SHA1 Message Date
Dan Albert
5f2ccb0efd Merge "Move adb to C++." 2015-03-10 00:58:06 +00:00
Dan Albert
bac3474a82 Move adb to C++.
I keep trying to clean things up and needing std::strings. Might as
well just do this now.

usb_linux_client.c is going to stay as C because GCC isn't smart
enough to deal with the designated initializers it uses (though for
some reason it is in C mode).

The Darwin files are staying as C because I don't have a way to test
that they build.

The Windows files are staying as C because while I can actually build
for them, it's slow and painful.

Change-Id: I75367d29205a9049d34460032b3bb36384f43941
2015-03-09 14:06:11 -07:00
Dan Albert
ea998e0ef9 am 9b1fd969: Merge "Fix a writex transcription error."
* commit '9b1fd969a7b7f1c6f1ed19719f21d57001d3c461':
  Fix a writex transcription error.
2015-03-09 20:35:54 +00:00
Dan Albert
9b1fd969a7 Merge "Fix a writex transcription error." 2015-03-09 20:29:07 +00:00
Dan Albert
f3519a8747 Fix a writex transcription error.
Change-Id: I71b11127d41ebac6caf68926089c5a3b99d8c21e
2015-03-09 13:22:02 -07:00
Dan Albert
8b09c27615 am 332c2881: Merge "Make the root/unroot test more robust."
* commit '332c2881305549450b162d854b139611d7bdc42f':
  Make the root/unroot test more robust.
2015-03-09 18:20:44 +00:00
Dan Albert
332c288130 Merge "Make the root/unroot test more robust." 2015-03-09 18:15:05 +00:00
Dan Albert
857d7db69d Make the root/unroot test more robust.
* Check the current adb user to choose the order of root/unroot.
* Re-root the device when finished.

Change-Id: I47a14b89e2c405bd63722e4d2043fcc629fb5e58
2015-03-09 10:45:50 -07:00
Mark Salyzyn
296bb2afec am c50f767e: Merge "logd: build cleanup"
* commit 'c50f767e7ea83fbf3d7dc8477292bccc413427dc':
  logd: build cleanup
2015-03-09 17:44:35 +00:00
Mark Salyzyn
c50f767e7e Merge "logd: build cleanup" 2015-03-09 17:20:08 +00:00
Mark Salyzyn
95b467888c logd: build cleanup
- Hard code the "auditd" event tag

Change-Id: I5f76fd286628be5c0ca819e8ed775648c0d2fa44
2015-03-09 10:02:51 -07:00
Mark Salyzyn
bba894af3f logcat: fortify help on filterspec
Bug: 19620794
Change-Id: I572ffb62d39d884d5102b0846a95b1a8216f3d41
2015-03-09 09:57:25 -07:00
Elliott Hughes
1d9f784f35 am 0ffaa2b7: Merge "Fix __android_log_assert to abort."
* commit '0ffaa2b75acde02b0ea0e7985dd957c6bc3a2370':
  Fix __android_log_assert to abort.
2015-03-09 15:21:46 +00:00
Elliott Hughes
0ffaa2b75a Merge "Fix __android_log_assert to abort." 2015-03-09 15:14:52 +00:00
Elliott Hughes
965ec3e1d7 am 6385d626: Merge "Remove toolbox\'s obsolete \'wipe\' command."
* commit '6385d626a585017ec1fe4027f4faa79741f9d117':
  Remove toolbox's obsolete 'wipe' command.
2015-03-07 19:24:25 +00:00
Elliott Hughes
02ff4b8feb Fix __android_log_assert to abort.
If you rely on __builtin_trap, it's likely to use an illegal instruction,
which is a misleading way to abort. If we just call abort, it's more
immediately obvious that we've aborted.

Bug: 19644330
Change-Id: I63a962e4748aec7b019ea94b007593e478a3b61a
2015-03-07 11:21:37 -08:00
Elliott Hughes
6385d626a5 Merge "Remove toolbox's obsolete 'wipe' command." 2015-03-07 19:19:23 +00:00
Elliott Hughes
bfa9d6a3c4 Remove toolbox's obsolete 'wipe' command.
It hasn't worked in some time (it removes /data/dalvik-cache, which is
required by art), and if you're prepared to reboot (to let init put back
all the directories a working system needs) there are other ways to wipe
data (such as "fastboot format userdata reboot").

Bug: 19644330
Change-Id: Ib074ea21cc28409a506d66d75060bb4ad85539e2
2015-03-07 11:07:10 -08:00
Dmitriy Ivanov
418dd72eb7 am 137c819e: Merge "Remove some more gotos"
* commit '137c819e16b757478807d89c4ac40d0b9dad6737':
  Remove some more gotos
2015-03-07 17:09:18 +00:00
Elliott Hughes
3f421e4d7a am d73df6ab: Merge "Fix outdated comments in grab-bootchart.sh."
* commit 'd73df6abb684d04b0ddb3835013706ac4b6ac27b':
  Fix outdated comments in grab-bootchart.sh.
2015-03-07 17:09:17 +00:00
Dmitriy Ivanov
9ae0abb2e6 am 3445cfe2: Merge "Reapply -Wold-style-cast"
* commit '3445cfe2b2461441d377aff0b00edd82fdf4f1ec':
  Reapply -Wold-style-cast
2015-03-07 17:09:16 +00:00
Dmitriy Ivanov
137c819e16 Merge "Remove some more gotos" 2015-03-06 22:38:06 +00:00
Dmitriy Ivanov
1f741e51bc Remove some more gotos
Change-Id: I9c4b3a5aecf4011653933b051e67605a6feb123f
2015-03-06 14:26:37 -08:00
Elliott Hughes
d73df6abb6 Merge "Fix outdated comments in grab-bootchart.sh." 2015-03-06 22:18:55 +00:00
Dmitriy Ivanov
3445cfe2b2 Merge "Reapply -Wold-style-cast" 2015-03-06 22:09:20 +00:00
Dmitriy Ivanov
f94e159007 Reapply -Wold-style-cast
Added pragmas to disable checks for the method
 using libz.h macros.

Change-Id: I25aa1adf09f3ecff61d8fea6306b24b37990ab46
2015-03-06 13:57:43 -08:00
Elliott Hughes
7c0c15f0ed Fix outdated comments in grab-bootchart.sh.
I've been deliberately vague about the name of the readme because I want to
come back and switch to markdown, but that probably won't happen today.

Change-Id: I60651703709bbfd499227f882eb949396e8f4f6c
2015-03-06 13:25:32 -08:00
Dmitriy Ivanov
6821d0b623 am 25d2a1a9: Merge "Fix build: Remove -Wold-style-cast"
* commit '25d2a1a916058634a23d89d287b18eb18c140081':
  Fix build: Remove -Wold-style-cast
2015-03-06 21:17:50 +00:00
Dmitriy Ivanov
25d2a1a916 Merge "Fix build: Remove -Wold-style-cast" 2015-03-06 21:11:49 +00:00
Dmitriy Ivanov
34d1b0fa63 Fix build: Remove -Wold-style-cast
libz.h has macros using old-style-cast.

Change-Id: I48f7d85805c7c34e1453c863da3c9e734a57d479
2015-03-06 13:07:52 -08:00
Mark Salyzyn
cd9afa1c27 am 4f0520fe: Merge "Revert "liblog: logprint use <endian.h>""
* commit '4f0520fe6c12baebb0c3098a1bdb17b814b8fd02':
  Revert "liblog: logprint use <endian.h>"
2015-03-06 20:56:37 +00:00
Dmitriy Ivanov
80a37e9abd am 34671b81: Merge "Remove some gotos"
* commit '34671b8100131b5a4f07f4dceac53a007497bc52':
  Remove some gotos
2015-03-06 20:56:36 +00:00
Mark Salyzyn
4f0520fe6c Merge "Revert "liblog: logprint use <endian.h>"" 2015-03-06 20:52:52 +00:00
Dmitriy Ivanov
34671b8100 Merge "Remove some gotos" 2015-03-06 20:51:48 +00:00
Dmitriy Ivanov
3ff6dd938b am 8b1a94c0: Merge "Cleanup old-style-cast warnings"
* commit '8b1a94c07cb02a0398238ebaab4a2a0a23f7d28c':
  Cleanup old-style-cast warnings
2015-03-06 20:50:11 +00:00
Dmitriy Ivanov
d1ce725613 am 4b8b148a: Merge "Remove unnecessary allocation of FileMaps"
* commit '4b8b148a8cb6c6044e64cf3c8834ebdcdf6de9dd':
  Remove unnecessary allocation of FileMaps
2015-03-06 20:50:09 +00:00
Mark Salyzyn
8470dad24f Revert "liblog: logprint use <endian.h>"
This reverts commit 66bfc5ccbd.

Bug: 19634248
Change-Id: I7c4851a247042193674f226fd0d5c5663e8074c7
2015-03-06 20:46:31 +00:00
Dmitriy Ivanov
3ea93da3c2 Remove some gotos
Change-Id: I0e162c8e0a700940f4302786b8523e5b2f5e5c27
2015-03-06 12:45:03 -08:00
Dmitriy Ivanov
8b1a94c07c Merge "Cleanup old-style-cast warnings" 2015-03-06 20:43:42 +00:00
Dmitriy Ivanov
4b8b148a8c Merge "Remove unnecessary allocation of FileMaps" 2015-03-06 20:43:20 +00:00
Dmitriy Ivanov
f4cb8e2ac2 Cleanup old-style-cast warnings
Change-Id: I6e17fd993557cbf78ade787f112794358aee39c8
2015-03-06 10:50:56 -08:00
Dmitriy Ivanov
4b67f8339d Remove unnecessary allocation of FileMaps
Change-Id: I97bb72b9edeee5b3eff4ffd21a761a1af472a3b5
2015-03-06 10:22:34 -08:00
Mark Salyzyn
e7c2a40197 am 88492ec4: Merge "liblog: build cleanup"
* commit '88492ec4e171a33b2d1ef42a0b7714cb2abedd0f':
  liblog: build cleanup
2015-03-05 19:30:20 +00:00
Mark Salyzyn
88492ec4e1 Merge "liblog: build cleanup" 2015-03-05 19:23:32 +00:00
Mark Salyzyn
1b79369877 liblog: build cleanup
- Drop CYGWIN build checking
- Hard code the "liblog" event tag
- Drop use of internal WITH_MINGW

Change-Id: I7b63bd7fa4471f340f356b477a0e5e25fe83a851
2015-03-05 11:10:00 -08:00
Mark Salyzyn
b71d0eabf1 am b6c411cf: Merge "liblog: logprint use <endian.h> part three"
* commit 'b6c411cf07b6cfe0cb2df3bce80ab8097b5d0d97':
  liblog: logprint use <endian.h> part three
2015-03-05 02:46:38 +00:00
Mark Salyzyn
b6c411cf07 Merge "liblog: logprint use <endian.h> part three" 2015-03-05 02:42:43 +00:00
Mark Salyzyn
31dd00fcf5 liblog: logprint use <endian.h> part three
Fix host/sdk builds:
- Drop logprint from list of host products
- Drop <endian.h> for FAKE_LOG_DEVICE

Change-Id: I8aa854413ff6d809f0b04987cf913eb228e4213c
2015-03-04 17:40:04 -08:00
Mark Salyzyn
92a2dab695 am 051222c2: Merge changes I12d6aa4e,I9e802113,I2b30e0fc,Iaf387b9e
* commit '051222c2436f3cb7fdbc87cc7bc28c5d3495eb28':
  logcat: remove dead label code
  logcat: do not stop on unexpected log ID
  Revert "logd: Add minimum time bucket statistics"
  liblog: Instrument logging of logd write drops
2015-03-05 01:17:19 +00:00
Mark Salyzyn
051222c243 Merge changes I12d6aa4e,I9e802113,I2b30e0fc,Iaf387b9e
* changes:
  logcat: remove dead label code
  logcat: do not stop on unexpected log ID
  Revert "logd: Add minimum time bucket statistics"
  liblog: Instrument logging of logd write drops
2015-03-05 01:12:06 +00:00