[Android] Reland of 'Add zip pushing and refine push mode selection.'

[Android] Reland of 'Add zip pushing and refine push mode selection.'

BUG=400440
Committed: https://crrev.com/8c07d893d4c539c6097e8b249c96785e98c1a9e8
Cr-Commit-Position: refs/heads/master@{#299284}

[jbudorick, 2014-10-10 19:34:51]

jbudorick@chromium.org changed reviewers:
+ cjhopman@chromium.org, craigdh@chromium.org, klundberg@chromium.org,
tonyg@chromium.org

[jbudorick, 2014-10-10 19:34:51]

This is a reland of https://codereview.chromium.org/646523002/.

The original patch (reproduced in patchset 1) broke on telemetry_perf_unittests
on Android Tests because AndroidCommands.GetChangedFIles could return
"/system/bin/sh: realpath: <device_path>: No such file or directory" as a device
path. AndroidCommands.PushIfNeeded circumvented this error through it's push
mode selection; in cases where this came up, AndroidCommands wound up trying to
push based on the paths passed to it (i.e., a "directory" push) instead of the
paths returned by GetChangedFiles.

The revised patch passes BenchmarkSmokeTest.webrtc.webrtc_cases, the
telemetry_perf_unittest that broke.

ptal

[jbudorick, 2014-10-10 19:38:07]

I should add: this fixes the issue by moving parts of GetFilesChanged up into
DeviceUtils and using _RunShellCommandImpl's check_return parameter to verify
that realpath actually worked.

[craigdh, 2014-10-10 20:07:41]

rubberstamp lgtm.

[cjhopman, 2014-10-10 23:24:06]

lgtm

[tonyg, 2014-10-11 00:59:16]

lgtm for telemetry owners

[jbudorick, 2014-10-13 07:58:45]

The CQ bit was checked by jbudorick@chromium.org

[commit-bot: I haz the power, 2014-10-13 07:59:18]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/647013002/460001

[jbudorick, 2014-10-13 09:03:33]

The CQ bit was unchecked by jbudorick@chromium.org

[jbudorick, 2014-10-13 10:53:53]

The CQ bit was checked by jbudorick@chromium.org

[commit-bot: I haz the power, 2014-10-13 10:54:33]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/647013002/680001

[commit-bot: I haz the power, 2014-10-13 11:39:56]

Committed patchset #5 (id:680001)

[commit-bot: I haz the power, 2014-10-13 11:40:47]

Patchset 5 (id:??) landed as
https://crrev.com/8c07d893d4c539c6097e8b249c96785e98c1a9e8
Cr-Commit-Position: refs/heads/master@{#299284}

[Kibeom Kim (inactive), 2014-10-13 18:51:14]

kkimlabs@chromium.org changed reviewers:
+ kkimlabs@chromium.org

[Kibeom Kim (inactive), 2014-10-13 18:51:14]

I synced today and was having the below issue. Reverting this CL locally solved.

ninja -C out/Debug -j 400 chrome_apk && adb shell am force-stop
com.google.android.apps.chrome ; adb shell am start
com.google.android.apps.chrome/.Main
ninja: Entering directory `out/Debug'
[825/862] ACTION Compiling chrome_java java sources
Note:
../chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java uses
or overrides a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
[829/862] ACTION Linting chrome_java

org/chromium/chrome/browser/WebappAuthenticator$1.class Potentially insecure
random numbers on Android 4.3 and older. Read
https://android-developers.blogspot.com/2013/08/some-securerandom-thoughts.html
for more info.: TrulyRandom [warning]
org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.class
`org/chromium/chrome/browser/appmenu/AppMenuButtonHelper#onTouch` should call
`View#performClick` when a click is detected: ClickableViewAccessibility
[warning]

Lint found 2 new issues.
 - For full explanation refer to out/Debug/gen/chrome_java/lint_result.xml
 - Wanna suppress these issues?
    1. Read comment in build/android/lint/suppressions.xml
    2. Run "python build/android/lint/suppress.py
out/Debug/gen/chrome_java/lint_result.xml"

[835/862] ACTION Compiling chrome_private_java java sources
Note:
../../../clank/java/apps/chrome/src/com/google/android/apps/chrome/snapshot/cloudprint/AuthTokenHelper.java
uses or overrides a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
[859/861] ACTION Pushing libraries to device for chrome_apk
FAILED: cd ../../clank/native/framework; python
../../../build/android/gyp/push_libraries.py
"--build-device-configuration=../../../out/Debug/build_devices.cfg"
"--libraries-dir=../../../out/Debug/chrome_apk/lib.stripped/lib/armeabi-v7a"
"--device-dir=/data/data/org.chromium.gyp_managed_install/chrome_apk/Debug/lib.stripped"
"--libraries=@FileArg(../../../out/Debug/chrome_apk/native_libraries.json:libraries)"
"--stamp=../../../out/Debug/chrome_apk/push.stamp" "--configuration-name=Debug"
CRITICAL:root:5237 KB/s (8858440 bytes in 1.651s)

CRITICAL:root:3771 KB/s (8858440 bytes in 2.294s)

CRITICAL:root:2797 KB/s (8858440 bytes in 3.092s)

CRITICAL:root:4054 KB/s (8858440 bytes in 2.133s)

Traceback (most recent call last):
  File "../../../build/android/gyp/push_libraries.py", line 80, in <module>
    sys.exit(main(sys.argv[1:]))
  File "../../../build/android/gyp/push_libraries.py", line 73, in main
    DoPush(options)
  File "../../../build/android/gyp/push_libraries.py", line 50, in DoPush
    input_strings=[device_path])
  File
"/usr/local/google/code/clankium-master/src/build/android/gyp/util/md5_check.py",
line 30, in CallAndRecordIfStale
    function()
  File "../../../build/android/gyp/push_libraries.py", line 43, in Push
    device.PushChangedFiles([(host_path, device_path)])
  File
"/usr/local/google/code/clankium-master/src/build/android/gyp/util/build_device.py",
line 37, in PushChangedFiles
    return self.device.PushChangedFiles(*args, **kwargs)
  File "../../../build/android/gyp/../pylib/device/decorators.py", line 51, in
TimeoutRetryWrapper
    return timeout_retry.Run(impl, timeout, retries)
  File "../../../build/android/gyp/../pylib/utils/timeout_retry.py", line 45, in
Run
    thread_group.JoinAll(watchdog_timer.WatchdogTimer(timeout))
  File "../../../build/android/gyp/../pylib/utils/reraiser_thread.py", line 141,
in JoinAll
    self._JoinAll(watcher)
  File "../../../build/android/gyp/../pylib/utils/reraiser_thread.py", line 128,
in _JoinAll
    thread.ReraiseIfException()
  File "../../../build/android/gyp/../pylib/utils/reraiser_thread.py", line 76,
in run
    self._ret = self._func(*self._args, **self._kwargs)
  File "../../../build/android/gyp/../pylib/utils/timeout_retry.py", line 37, in
RunOnTimeoutThread
    ret[0] = func(*args, **kwargs)
  File "../../../build/android/gyp/../pylib/device/decorators.py", line 49, in
impl
    return f(*args, **kwargs)
  File "../../../build/android/gyp/../pylib/device/device_utils.py", line 536,
in PushChangedFiles
    self._PushChangedFilesZipped(files)
  File "../../../build/android/gyp/../pylib/device/device_utils.py", line 631,
in _PushChangedFilesZipped
    env={'PATH': '$PATH:%s' % install_commands.BIN_DIR})
  File "../../../build/android/gyp/../pylib/device/device_utils.py", line 324,
in _RunShellCommandImpl
    cmd.split(), 'Nonzero exit code (%d)' % code, device=str(self))
pylib.device.device_errors.AdbCommandFailedError: (device: 00311c79e0151656) adb
command 'PATH=$PATH:/data/local/tmp/bin unzip /storage/emulated/legacy/tmp.zip'
failed with message: 'Nonzero exit code (134)'
[859/861] ACTION Signing/aligning chrome_apk APK:
chrome_apk/Chrome-standalone-unsigned.apk^C
ninja: build stopped: interrupted by user.
Starting: Intent { act=android.intent.action.MAIN
cat=[android.intent.category.LAUNCHER] cmp=com.google.android.apps.chrome/.Main
}