Make client_engine_integration.py use chromium's adb |
||||||
Issue descriptionSteps to reproduce: 1. Follow instructions to compile the blimp engine 2. Run: $ ./out-engine/Debug/bin/client_engine_integration run 3. Follow instructions to compile the blimp client 4. Connect the client to the engine. 5. To see client side log, run: $ ./third_party/android_tools/sdk/platform-tools/adb logcat Expected result: Logcat works fine. Actual result: The blimp connection disconnects, and the follow error message is shown: $ adb logcat adb server version (32) doesn't match this client (36); killing... * daemon started successfully * --------- beginning of crash Notes: There is currently a mismatch between the catapult/devil python library ADB version and the one in the SDK. This causes issues when running the script for the Blimp engine, since it uses that library: $ ./out-engine/Debug/bin/client_engine_integration run If you then later use 'adb logcat' to see the client log, and the path for that points to the checked in version of adb in //third_party/android_tools/sdk/platform-tools, the latter will kill the first, which also includes killing the port forwarding. These are the version I have after a sync for src@8a274fa60fec11c1c1ddbeb2ee64c3ffb60ca84c : $ ./third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb version Android Debug Bridge version 1.0.32 Revision eac51f2bb6a8-android $ ./third_party/android_tools/sdk/platform-tools/adb version Android Debug Bridge version 1.0.36 Revision 8f855a3d9b35-android It would be great if these two binaries could have the same version.
,
Nov 15 2016
oh, we know. The integration script should be configured to use chromium's adb by default if it isn't already.
,
Nov 15 2016
,
Nov 15 2016
Sarah, can you make the integration script: - accept an --adb-path argument - use devil_chromium.Initialize to set up adb etc
,
Nov 15 2016
,
Nov 15 2016
CL in CQ: https://codereview.chromium.org/2503453004/ Thanks for jumping on this so quickly shenghuazhang@!
,
Nov 15 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/aadd4dcb24b07b0c5cce7220a1207d503a7af898 commit aadd4dcb24b07b0c5cce7220a1207d503a7af898 Author: shenghuazhang <shenghuazhang@chromium.org> Date: Tue Nov 15 05:14:56 2016 Add '--adb-path' argument to integration script to modify adb version - Add '--adb-path' argument in parse. - Set default adb path to the the chromium's adb - Set up adb by using devil_chromium.Initialize BUG= 665254 Review-Url: https://codereview.chromium.org/2503453004 Cr-Commit-Position: refs/heads/master@{#432112} [modify] https://crrev.com/aadd4dcb24b07b0c5cce7220a1207d503a7af898/blimp/tools/client_engine_integration.py
,
Nov 15 2016
,
Dec 9 2016
|
||||||
►
Sign in to add a comment |
||||||
Comment 1 by nyquist@chromium.org
, Nov 15 2016