summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorpaulmiller <paulmiller@chromium.org>2016-01-15 12:24:37 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-15 20:26:37 +0000
commit4b0981edaacf545be616b0eeeab9643d6429a5a2 (patch)
tree833f6f7feed41ed90ba9a5f4530fbb3c05cafd32 /android_webview
parentccf7efa716b2e2bd47cf9e4bd2fd5ee47abc7f51 (diff)
downloadchromium_src-4b0981edaacf545be616b0eeeab9643d6429a5a2.zip
chromium_src-4b0981edaacf545be616b0eeeab9643d6429a5a2.tar.gz
chromium_src-4b0981edaacf545be616b0eeeab9643d6429a5a2.tar.bz2
Fix race condition in WebView metrics build
The gyp metrics component expects us to depend on the metrics protos ourselves, whereas the gn metrics component does that for us. BUG=578046 Review URL: https://codereview.chromium.org/1592843002 Cr-Commit-Position: refs/heads/master@{#369829}
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/android_webview.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 7272bf7..626d1b8 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -227,6 +227,7 @@
'../components/components.gyp:breakpad_host',
'../components/components.gyp:cdm_browser',
'../components/components.gyp:cdm_renderer',
+ '../components/components.gyp:component_metrics_proto',
'../components/components.gyp:crash_component',
'../components/components.gyp:data_reduction_proxy_core_browser',
'../components/components.gyp:devtools_discovery',