diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
| commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
| tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/components/invalidation | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
| download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz | |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/invalidation')
| -rw-r--r-- | chromium/components/invalidation/impl/BUILD.gn | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/components/invalidation/impl/BUILD.gn b/chromium/components/invalidation/impl/BUILD.gn index c984af957ee..98934dd2eb1 100644 --- a/chromium/components/invalidation/impl/BUILD.gn +++ b/chromium/components/invalidation/impl/BUILD.gn @@ -6,7 +6,7 @@ if (is_android) { import("//build/config/android/rules.gni") } -source_set("impl") { +static_library("impl") { sources = [ "invalidation_logger.cc", "invalidation_logger.h", @@ -207,7 +207,8 @@ if (is_android) { deps = [ ":proto_java", "//base:base_java", - "//sync/android:sync_java", + "//components/signin/core/browser/android:java", + "//components/sync/android:sync_java", "//third_party/android_protobuf:protobuf_nano_javalib", "//third_party/cacheinvalidation:cacheinvalidation_javalib", "//third_party/cacheinvalidation:cacheinvalidation_proto_java", @@ -226,11 +227,13 @@ if (is_android) { ] } android_library("javatests") { + testonly = true deps = [ ":java", "//base:base_java", "//base:base_java_test_support", - "//sync/android:sync_java", + "//components/signin/core/browser/android:java", + "//components/sync/android:sync_java", "//third_party/cacheinvalidation:cacheinvalidation_javalib", "//third_party/cacheinvalidation:cacheinvalidation_proto_java", ] |