diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 13:24:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 10:57:25 +0000 |
| commit | af3d4809763ef308f08ced947a73b624729ac7ea (patch) | |
| tree | 4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/third_party/cacheinvalidation | |
| parent | 0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff) | |
| download | qtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking.
Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/cacheinvalidation')
| -rw-r--r-- | chromium/third_party/cacheinvalidation/cacheinvalidation.gyp | 1 | ||||
| -rw-r--r-- | chromium/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/chromium/third_party/cacheinvalidation/cacheinvalidation.gyp b/chromium/third_party/cacheinvalidation/cacheinvalidation.gyp index 77558075b3c..dea1f54b533 100644 --- a/chromium/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/chromium/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -223,6 +223,7 @@ 'type': 'none', 'dependencies': [ '../../third_party/android_tools/android_tools.gyp:android_gcm', + '../../third_party/android_tools/android_tools.gyp:google_play_services_javalib', 'cacheinvalidation_proto_java', ], 'variables': { diff --git a/chromium/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate b/chromium/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate index eefbeb9ffe9..405f35f0d57 100644 --- a/chromium/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate +++ b/chromium/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate @@ -9,9 +9,6 @@ '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)', '--test-launcher-bot-mode', ], - 'files': [ - '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)', - ], }, }], ], |