diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-12 11:40:13 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-12 09:52:12 +0000 |
| commit | 980b784afe75be22158126ac6a639c19459d3427 (patch) | |
| tree | cc9111d7faa5042ad860237f5c5ec88ce4bd987c /chromium/build | |
| parent | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (diff) | |
| download | qtwebengine-chromium-980b784afe75be22158126ac6a639c19459d3427.tar.gz | |
BASELINE: Update Chromium to 51.0.2704.47
And adds in a few missing files.
Change-Id: Id0d85c81f5efc1b1c8cf9cb3241da26bf7245026
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'chromium/build')
| -rw-r--r-- | chromium/build/config/android/internal_rules.gni | 13 | ||||
| -rw-r--r-- | chromium/build/util/LASTCHANGE | 2 | ||||
| -rw-r--r-- | chromium/build/util/LASTCHANGE.blink | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/chromium/build/config/android/internal_rules.gni b/chromium/build/config/android/internal_rules.gni index 140bd4854f9..4fc06f2604e 100644 --- a/chromium/build/config/android/internal_rules.gni +++ b/chromium/build/config/android/internal_rules.gni @@ -2062,13 +2062,18 @@ template("test_runner_script") { defined(invoker.incremental_install) && invoker.incremental_install action(target_name) { + data_deps = [] + deps = [] + forward_variables_from(invoker, + [ + "data_deps", + "deps", + ]) + script = "//build/android/gyp/create_test_runner_script.py" depfile = "$target_gen_dir/$target_name.d" - deps = [] - datadeps = [ - "//build/android:test_runner_py", - ] + data_deps += [ "//build/android:test_runner_py" ] test_runner_args = [ _test_type, diff --git a/chromium/build/util/LASTCHANGE b/chromium/build/util/LASTCHANGE index 87837920edd..3b733df181e 100644 --- a/chromium/build/util/LASTCHANGE +++ b/chromium/build/util/LASTCHANGE @@ -1 +1 @@ -LASTCHANGE=f044a3362ac0411703fa914c53149e4a5834c9cc +LASTCHANGE=62253c147664bd5ab44265dfc0b7ea42e2619a4c diff --git a/chromium/build/util/LASTCHANGE.blink b/chromium/build/util/LASTCHANGE.blink index 87837920edd..3b733df181e 100644 --- a/chromium/build/util/LASTCHANGE.blink +++ b/chromium/build/util/LASTCHANGE.blink @@ -1 +1 @@ -LASTCHANGE=f044a3362ac0411703fa914c53149e4a5834c9cc +LASTCHANGE=62253c147664bd5ab44265dfc0b7ea42e2619a4c |