Commit Graph

40467 Commits

Author SHA1 Message Date
Elliott Hughes c6dbacd50d Merge "Move adb/fastboot bash completion into adb/fastboot." am: 9c8c03896e
am: 081e7f5eaa

Change-Id: I6a7e26de30a3c0a18ef6a0967077e38b4bda38c7
2018-04-04 13:09:03 -07:00
Elliott Hughes 081e7f5eaa Merge "Move adb/fastboot bash completion into adb/fastboot."
am: 9c8c03896e

Change-Id: I29944eb883d6597f2df94407ab125616402aee72
2018-04-04 12:59:28 -07:00
Elliott Hughes 9c8c03896e Merge "Move adb/fastboot bash completion into adb/fastboot." 2018-04-04 19:44:37 +00:00
Christopher Ferris 82431e9e1e Merge "Add a MemoryOfflineBuffer object." am: c692ff9043
am: 0f2e8bb576

Change-Id: Ief9ea91d9d90c5be4fb3cf12cc65035ca57bf040
2018-04-04 10:53:18 -07:00
Christopher Ferris 0f2e8bb576 Merge "Add a MemoryOfflineBuffer object."
am: c692ff9043

Change-Id: I2f73ae14c4da9cd61d2d970dfd4742420fd45884
2018-04-04 10:48:12 -07:00
Christopher Ferris c692ff9043 Merge "Add a MemoryOfflineBuffer object." 2018-04-04 17:39:13 +00:00
Elliott Hughes fbfa0e8781 Move adb/fastboot bash completion into adb/fastboot.
Bug: http://b/74443706
Test: bash completion still works.
Change-Id: I9da3a0ae748a202407652f513c990e9d05f8b01a
2018-04-04 08:33:33 -07:00
David Brazdil 20ab3df0a6 Merge "Revert "adb: add transport benchmark."" am: 3876e37319
am: 566cf781cf

Change-Id: I30b46eb5392468bc3542d0ee6d36240c361178ad
2018-04-04 04:59:55 -07:00
David Brazdil 566cf781cf Merge "Revert "adb: add transport benchmark.""
am: 3876e37319

Change-Id: Iad5ec02575663fe83ba0666aeebfb8c33567c14b
2018-04-04 04:54:48 -07:00
David Brazdil 3876e37319 Merge "Revert "adb: add transport benchmark."" 2018-04-04 11:42:39 +00:00
David Brazdil 2ef56a1174 Revert "adb: add transport benchmark."
This reverts commit d78f59ca53.

Reason for revert: Breaks aosp-master renderscript and sdk_mac:
  error: system/core/adb/Android.bp:199:19: unrecognized property "host_supported"

Change-Id: Ifd75921dcdf5dce57f98833a913540914984b293
2018-04-04 10:32:08 +00:00
Josh Gao ad45a986c8 Merge "adb: add transport benchmark." am: 3f6ef0d2d2
am: 643187d895

Change-Id: I224207a522ced476aa1cbf5a23e93a9fd6120d75
2018-04-04 00:15:24 -07:00
Josh Gao 937a60634f Merge "adb: don't abort when connecting to the same address twice." am: 60c6023902
am: d550ab0c16

Change-Id: I56b76c960cf9f5270cd7ea97cb4307d3323053c9
2018-04-04 00:14:49 -07:00
Josh Gao 643187d895 Merge "adb: add transport benchmark."
am: 3f6ef0d2d2

Change-Id: Ibac7d138079c7c94e0913506f7b22cc9393c9237
2018-04-04 00:10:46 -07:00
Josh Gao d550ab0c16 Merge "adb: don't abort when connecting to the same address twice."
am: 60c6023902

Change-Id: I9fb8dd78288e4f5a3c6cc1ddb8a2cae8f2b81fce
2018-04-04 00:10:12 -07:00
Josh Gao 3f6ef0d2d2 Merge "adb: add transport benchmark." 2018-04-04 07:02:07 +00:00
Josh Gao 60c6023902 Merge "adb: don't abort when connecting to the same address twice." 2018-04-04 07:02:00 +00:00
Christopher Ferris 6633b0ca09 Add a MemoryOfflineBuffer object.
Use this for offline stack data so that it's not necessary to
copy any data around.

Add unit tests for the new object.

Bug: 77258731
Bug: 74354410

Test: Ran libunwindstack/libbacktrace unit tests.
Change-Id: I9b0f25d9520c96e64aedef5f295423c60ddb3488
2018-04-03 18:37:52 -07:00
Josh Gao d78f59ca53 adb: add transport benchmark.
Add some basic benchmarks for the underlying transport.

Test: adb_benchmark
Change-Id: I6475a66eb5a43a241c907046c23fea68263db945
2018-04-03 16:54:51 -07:00
Josh Gao c251ec55d3 adb: don't abort when connecting to the same address twice.
When connecting to an address, we construct a transport first, and then
check whether we've already connected to that address. The consequent
destruction of the BlockingConnectionAdapter attempts to join threads
that haven't been started, which aborts.

Make it safe to destruct a BlockingConnectionAdapter without calling
Start on it first, to solve this.

Bug: http://b/69137547
Test: nc -l 12345 & (adb connect localhost:12345; adb connect localhost:12345)
Test: python test_adb.py
Change-Id: I6cb968a62dbac6332907e06575893d764905ee62
2018-04-03 13:58:21 -07:00
Hridya Valsaraju 46411b6f8d [automerger skipped] Merge "Add a header-version argument to fastboot" am: a10d40e2b2
am: 0f217b52b4  -s ours

Change-Id: I7788db487f3e799faf1aaf9e9bfe2ab394d4d1e4
2018-04-03 11:50:50 -07:00
Hridya Valsaraju 0f217b52b4 Merge "Add a header-version argument to fastboot"
am: a10d40e2b2

Change-Id: I1fc1ed567bd269c9ab32d810ba63489457416ab2
2018-04-03 11:45:44 -07:00
Treehugger Robot a10d40e2b2 Merge "Add a header-version argument to fastboot" 2018-04-03 18:33:57 +00:00
Jayant Chowdhary b1ed7e0c98 [automerger skipped] Merge "Add dummy vndk library libmkbootimg to enable abi checks on boot_img_hdr." into pi-dev
am: 0a5bc29353  -s ours

Change-Id: I304bebe3e3303a9b340cbc08a6919f92ee43d4f5
2018-04-03 09:46:47 -07:00
Jayant Chowdhary 0a5bc29353 Merge "Add dummy vndk library libmkbootimg to enable abi checks on boot_img_hdr." into pi-dev 2018-04-03 16:43:28 +00:00
Josh Gao 078c49f79d Merge changes Iff1ec14b,I32123c51,I517dbcba,Ic215c7fe am: b9b967e2fc
am: 606c83bcab

Change-Id: Ic21cdfcd9dbad36b7480ccb05be667e1a2c31693
2018-04-02 18:57:02 -07:00
Josh Gao 606c83bcab Merge changes Iff1ec14b,I32123c51,I517dbcba,Ic215c7fe
am: b9b967e2fc

Change-Id: Ia0c1c07dcc2ddfae072cb43a20960efe0de7e951
2018-04-02 18:53:43 -07:00
Josh Gao b9b967e2fc Merge changes Iff1ec14b,I32123c51,I517dbcba,Ic215c7fe
* changes:
  adb: try harder to fill our test sockets.
  adb: don't set has_write_error on success.
  adb: move ownership of the fdevent thread into FdeventTest.
  adb: guarantee that fdevent_run_on_main_thread happens last.
2018-04-03 01:44:14 +00:00
David Anderson d9c510f9c2 Merge "storaged: fix divide-by-zero when updating history" into pi-dev
am: 0b637d94d6

Change-Id: If668d3a3a349070a734ebce66e8e4eef0465bdef
2018-04-02 18:16:40 -07:00
Elliott Hughes 0ced95789b Merge "Improve fastboot verbose output." am: be5332d236
am: 3cdbced862

Change-Id: I8c3a1f3135b30bdeac7ac24d26a92bc16b0445b2
2018-04-02 18:14:31 -07:00
Elliott Hughes 3cdbced862 Merge "Improve fastboot verbose output."
am: be5332d236

Change-Id: I16cb4351bf9f9e6aa9f8de3b28bfff63a82c3f6a
2018-04-02 18:10:55 -07:00
Hridya Valsaraju cc2ec0da9e Add a header-version argument to fastboot
am: 88de5556ec

Change-Id: Ie2f988b85ffd366b1d32baf6df8d05ba8c61a882
2018-04-02 18:00:15 -07:00
Elliott Hughes be5332d236 Merge "Improve fastboot verbose output." 2018-04-03 00:58:33 +00:00
Jayant Chowdhary f4bda9a188 Add dummy vndk library libmkbootimg to enable abi checks on boot_img_hdr.
Bug: 74763691

Test: m -j libmkbootimg creates libmkbootimg.so.lsdump.

Test: make -j64

Merged-In: I8d716c560467aaf090f4f7ee9cfbc53a9405f05d
Change-Id: I8d716c560467aaf090f4f7ee9cfbc53a9405f05d
(cherry picked from commit 4cc755dce5)
2018-04-02 17:32:23 -07:00
TreeHugger Robot 0b637d94d6 Merge "storaged: fix divide-by-zero when updating history" into pi-dev 2018-04-03 00:12:17 +00:00
Chia-I Wu fbd4a52eca Merge "graphics: add render intents and new color modes" into pi-dev
am: e3447826a8

Change-Id: Id82fefe126a80cf1223e090522c3d64d76e8b77b
2018-04-02 23:52:04 +00:00
Hridya Valsaraju 7d824136ae Add a header-version argument to fastboot
The argument would set the boot header
version for flash:raw and boot
commands when they are used for boot
image creation.

Bug: 77154616
Test: Dumped the created boot image and checked
the header version using unpack_bootimg

Change-Id: I2c458996817615f4351db102b4234984108d47c0
Merged-In: I2c458996817615f4351db102b4234984108d47c0
(cherry picked from commit 88de5556ec)
2018-04-02 16:00:59 -07:00
Hridya Valsaraju 88de5556ec Add a header-version argument to fastboot
The argument would set the boot header
version for flash:raw and boot
commands when they are used for boot
image creation.

Bug: 77154616
Test: Dumped the created boot image and checked
the header version using unpack_bootimg

Change-Id: I2c458996817615f4351db102b4234984108d47c0
2018-04-02 22:50:53 +00:00
Chia-I Wu e3447826a8 Merge "graphics: add render intents and new color modes" into pi-dev 2018-04-02 22:22:28 +00:00
Elliott Hughes 855cdf82f5 Improve fastboot verbose output.
Move some verbose messages so they're only output with -v.

Remove some misleading verbose messages altogether (such as "wiping
userdata...").

Properly log all the commands sent and responses received. Example:

  $ fastboot -v flashall
  ...
  Sending sparse 'system' 2/2 (443712 KB)
  fastboot: verbose: sending command "download:1b1500d0"
  fastboot: verbose: received DATA 1b1500d0
  fastboot: verbose: sending data (1024 bytes)
  fastboot: verbose: sending data (165596160 bytes)
  fastboot: verbose: sending data (1024 bytes)
  fastboot: verbose: sending data (267762688 bytes)
  fastboot: verbose: sending data (1024 bytes)
  fastboot: verbose: sending data (20978688 bytes)
  fastboot: verbose: sending data (1024 bytes)
  fastboot: verbose: sending data (7168 bytes)
  fastboot: verbose: sending data (1024 bytes)
  fastboot: verbose: sending data (3072 bytes)
  fastboot: verbose: sending data (1024 bytes)
  fastboot: verbose: sending data (3072 bytes)
  fastboot: verbose: sending data (1024 bytes)
  fastboot: verbose: sending data (3072 bytes)
  fastboot: verbose: sending data (208 bytes)
  fastboot: verbose: received OKAY
  OKAY [ 13.871s]
  Writing sparse 'system' 2/2
  fastboot: verbose: sending command "flash:system"
  fastboot: verbose: received OKAY
  OKAY [  3.228s]
  Rebooting
  fastboot: verbose: sending command "reboot"
  fastboot: verbose: received OKAY

  Finished. Total time: 36.939s

Bug: http://b/30953083
Bug: http://b/74444116
Test: `fastboot -v flashall`
Change-Id: I2cca198daa062fd1fb732218343263803b111e38
2018-04-02 14:28:18 -07:00
Josh Gao 7651eb9ef7 adb: try harder to fill our test sockets.
On platforms that implement sockets via underlying sockets (e.g. Wine),
a socket can appear to be full, and then become available for writes
again without read being called on the other end. Add a sleep after
each write to give the underlying implementation time to flush.

This doesn't help us if the buffer size is smaller than MAX_PAYLOAD,
but at least in the case of Wine, that doesn't seem to be the case.

Test: adb_test
Test: wine adb_test.exe
Change-Id: Iff1ec14bbf318b9742ec7e2fb72e34e3d6bbe6ad
2018-04-02 14:18:50 -07:00
Josh Gao 954e1280d7 adb: don't set has_write_error on success.
Whoops.

Test: adb_test
Change-Id: I32123c51446a22d4423eef0753b0a0b00b500a90
2018-04-02 14:18:27 -07:00
Elliott Hughes 6b3c5b838a Merge "Modernize fastboot output format." am: 194e27bf5e
am: a6905f79b7

Change-Id: I33c1177e140d557529abdb93edcd2c8dfb87907c
2018-04-02 21:14:18 +00:00
Elliott Hughes a6905f79b7 Merge "Modernize fastboot output format."
am: 194e27bf5e

Change-Id: Ibeb6efa19597998c8b391b22f97fc336f242c193
2018-04-02 21:04:37 +00:00
Elliott Hughes 194e27bf5e Merge "Modernize fastboot output format." 2018-04-02 20:47:53 +00:00
Elliott Hughes f238d8751b Modernize fastboot output format.
After:

  --------------------------------------------
  Bootloader Version...: 0.5
  Baseband Version.....: 0.5
  Serial Number........: serialv1.0
  --------------------------------------------
  Checking product                                   OKAY [  0.032s]
  Sending 'boot' (9962 KB)                           OKAY [  0.350s]
  Writing 'boot'                                     OKAY [  0.143s]
  Sending 'dts' (14 KB)                              OKAY [  0.068s]
  Writing 'dts'                                      OKAY [  0.048s]
  Sending sparse 'system' 1/2 (460796 KB)            OKAY [ 14.383s]
  Writing sparse 'system' 1/2                        OKAY [  4.138s]
  Sending sparse 'system' 2/2 (443712 KB)            OKAY [ 13.871s]
  Writing sparse 'system' 2/2                        OKAY [  3.246s]
  Rebooting
  Finished. Total time: 36.962s

For a failure:

  extracting android-info.txt (0 MB) to RAM...
  --------------------------------------------
  Bootloader Version...: 0.5
  Baseband Version.....: 0.5
  Serial Number........: serialv1.0
  --------------------------------------------
  Checking product                                   FAILED

  Device product is 'hikey960'.
  Update requires 'marlin' or 'sailfish'.

  fastboot: error: requirements not met!

This change also adds a -v/--verbose flag, but doesn't make much use of
it yet (http://b/30953083 will need it).

Bug: N/A
Test: manual
Change-Id: I7d19f5775859ffad5f3be5707b37dcb6e180917f
2018-04-02 11:01:48 -07:00
Tao Bao 88161a7a2e Merge "Add dummy vndk library libmkbootimg to enable abi checks on boot_img_hdr." am: b7ba61ffc5
am: 30dcecc170

Change-Id: I51c465647fcc705064eb76146557fd9afdafebe9
2018-03-31 17:22:29 +00:00
Tao Bao 30dcecc170 Merge "Add dummy vndk library libmkbootimg to enable abi checks on boot_img_hdr."
am: b7ba61ffc5

Change-Id: I1d8bc6b6a7854af694c9eb642953c40d7521a2d0
2018-03-31 17:15:51 +00:00
Tao Bao b7ba61ffc5 Merge "Add dummy vndk library libmkbootimg to enable abi checks on boot_img_hdr." 2018-03-31 17:03:25 +00:00
Jayant Chowdhary 478c7c1eaf Add dummy vndk library libmkbootimg to enable abi checks on boot_img_hdr.
Bug: 74763691

Test: m -j libmkbootimg creates libmkbootimg.so.lsdump.

Test: make -j64

Change-Id: I8d716c560467aaf090f4f7ee9cfbc53a9405f05d
(cherry picked from commit 4cc755dce5)
2018-03-31 07:13:33 -07:00