Commit Graph

40443 Commits

Author SHA1 Message Date
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 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
Paul Crowley e616410e9c Merge "Support Speck encryption." into pi-dev
am: 9d1f78358a

Change-Id: I03f5432bd625484e7d31034fe1a0e02f8a936bbf
2018-03-30 22:45:36 +00:00
Josh Gao 7ab55713cc adb: move ownership of the fdevent thread into FdeventTest.
Previously, each of the tests was spawning the fdevent thread manually,
in order to be able to set up listeners and such before running
fdevent_loop. Now that we have a way to run arbitrary code on the
fdevent thread, switch to having a generic fdevent thread and running
setup code via fdevent_run_on_main_thread.

Test: adb_test
Test: wine adb_test.exe
Change-Id: I517dbcbad31067b45087d9fbed67a75b75a75aec
2018-03-30 14:57:09 -07:00
Josh Gao d5655d7e5c Merge changes I06ccca30,Iee86b058 am: e6ae06e687
am: 3504d5a535

Change-Id: Idb80639b32c461b573553ca5da8e8a388236b8e1
2018-03-30 21:54:49 +00:00
Josh Gao 3504d5a535 Merge changes I06ccca30,Iee86b058
am: e6ae06e687

Change-Id: Ie3ee46a42b05b9bfda3eb5233fe57721635baed9
2018-03-30 21:49:23 +00:00
Josh Gao fa30bf3932 adb: guarantee that fdevent_run_on_main_thread happens last.
Make it so that we handle run_on_main_thread calls after regular socket
events, so that we can use it as a way to ensure we've processed all
pending socket events.

Test: adb_test
Test: wine adb_test.exe
Change-Id: Ic215c7fed19a8e1699e759970658b3775aa08c45
2018-03-30 14:38:25 -07:00
Josh Gao e6ae06e687 Merge changes I06ccca30,Iee86b058
* changes:
  adb: fix FdeventTest.invalid_fd on Windows.
  adb: extract the sleep in socket_test to its own function.
2018-03-30 21:38:16 +00:00
Paul Crowley 0feca7cf7e Merge "Support Speck encryption." am: 14da8f607f
am: 1df4cee2d1

Change-Id: I12936d157eac453515e44dba260920be5f414f2e
2018-03-30 21:08:48 +00:00
Paul Crowley 1df4cee2d1 Merge "Support Speck encryption."
am: 14da8f607f

Change-Id: I3914b1d09fbb3ba234b0f56488e5aacd622280b0
2018-03-30 21:03:09 +00:00
TreeHugger Robot 9d1f78358a Merge "Support Speck encryption." into pi-dev 2018-03-30 20:54:36 +00:00
Treehugger Robot 14da8f607f Merge "Support Speck encryption." 2018-03-30 20:51:14 +00:00
Logan Chien d7cf5a0899 [automerger skipped] Allow VNDK-SP extensions to use vendor lib
am: e9aaadfb2b  -s ours

Change-Id: I4fb01f1ff3bc083e48159763cb9484b31d9b2f8f
2018-03-30 20:50:39 +00:00
Hridya Valsaraju 76732e5ad0 [automerger skipped] Merge changes from topic "recovery-dtbo" into pi-dev
am: adf13a65b9  -s ours

Change-Id: I5faaef48499cd5dc83470707daa30b5b10798722
2018-03-30 20:50:04 +00:00
Hridya Valsaraju 75e6389167 [automerger skipped] Add a script to unpack boot image
am: d71e39ae57  -s ours

Change-Id: I08fd141db102aa5eb65b9847c743896994955a29
2018-03-30 20:28:34 +00:00
Jaekyun Seok 5814a9c542 [automerger skipped] Merge "Allow vendor-init-actionable for ro.board.platform and sys.boot_from_charger_mode" into pi-dev
am: bd920a25a9  -s ours

Change-Id: I6538419f1eb83c4f2220e2fd02011698e020aa1e
2018-03-30 20:27:10 +00:00
Elliott Hughes 01dcf88960 Merge "Add "require partition-exists=" support." into pi-dev
am: 465704dbb2

Change-Id: If26ee7b9934f8ecca966aed09f53412e2825a053
2018-03-30 20:26:24 +00:00
David Srbecky 8757e8e311 Cache DWARF location rules for a given pc.
am: 12d902961b

Change-Id: Ieb5b1d6e220e6715ca8efc907d63ad6cb7a57628
2018-03-30 20:25:52 +00:00
Christopher Ferris b12db05e99 Merge "Fix null pointer dereference in RegsArm." into pi-dev
am: 8dc3f94113

Change-Id: Ifd3976fa8f1148d45cd32627548438e90695224f
2018-03-30 20:25:35 +00:00
Josh Gao 0b54aa1b4b [automerger skipped] adb: fix windows test build.
am: 83ebd8da84  -s ours

Change-Id: Iaeedac9eb300dea9f22c47492215e14e782c6b3f
2018-03-30 20:24:25 +00:00
Josh Gao 2072ce099d adb: bump the local socket backlog to the maximum.
am: abb634308f

Change-Id: I4f99ff20ab664c13e57ffafc78a3896cfb2fdba0
2018-03-30 20:23:55 +00:00
Josh Gao 31ab8c9307 adb: delete vestigial SHELL_EXIT_NOTIFY_FD.
am: cc9414eda4

Change-Id: I3edee6c2431c9fb8b1a6b6f82d63923bd676388e
2018-03-30 20:23:36 +00:00
Josh Gao 96fca43c55 adb: don't immediately close a socket when write fails.
am: 7c87b0739a

Change-Id: I81d8e14285a8272ed0cae45a7e366db628939b20
2018-03-30 20:23:10 +00:00
Josh Gao af7659ec43 adb: make fdevent_run_on_main_thread's fd nonblocking.
am: 3b0146cc37

Change-Id: I1c3c7c73dc0231f1dac1448b374ba485b8eb6a42
2018-03-30 20:22:52 +00:00
Josh Gao 4601fce32a adb: skip IPv6 test if IPv6 isn't available.
am: 9edb94fb6b

Change-Id: Ibc539fe9dac59ac207397971384b53905e642292
2018-03-30 20:22:35 +00:00
Josh Gao 7ca8cf70ee adb: add `adb shell exit 42` stress test.
am: fd6ffb8ad5

Change-Id: Iba1c0898f6480b9d94f1cb48b05f969156a550a8
2018-03-30 20:22:16 +00:00