summaryrefslogtreecommitdiff
path: root/chromium/components/background_task_scheduler
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-29 10:46:47 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-02 12:02:10 +0000
commit99677208ff3b216fdfec551fbe548da5520cd6fb (patch)
tree476a4865c10320249360e859d8fdd3e01833b03a /chromium/components/background_task_scheduler
parentc30a6232df03e1efbd9f3b226777b07e087a1122 (diff)
downloadqtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/background_task_scheduler')
-rw-r--r--chromium/components/background_task_scheduler/BUILD.gn1
-rw-r--r--chromium/components/background_task_scheduler/OWNERS5
-rw-r--r--chromium/components/background_task_scheduler/internal/BUILD.gn3
3 files changed, 7 insertions, 2 deletions
diff --git a/chromium/components/background_task_scheduler/BUILD.gn b/chromium/components/background_task_scheduler/BUILD.gn
index 7c4436d9e68..a98456fa561 100644
--- a/chromium/components/background_task_scheduler/BUILD.gn
+++ b/chromium/components/background_task_scheduler/BUILD.gn
@@ -95,6 +95,7 @@ if (is_android) {
deps = [
":public_java",
"internal:internal_java",
+ "//third_party/android_deps:androidx_annotation_annotation_java",
]
}
diff --git a/chromium/components/background_task_scheduler/OWNERS b/chromium/components/background_task_scheduler/OWNERS
index 7a3fa83f78a..d0e05981a84 100644
--- a/chromium/components/background_task_scheduler/OWNERS
+++ b/chromium/components/background_task_scheduler/OWNERS
@@ -1,5 +1,7 @@
dtrainor@chromium.org
fgorski@chromium.org
+hanxi@chromium.org
+mheikal@chromium.org
nyquist@chromium.org
peter@chromium.org
shaktisahu@chromium.org
@@ -8,4 +10,5 @@ shaktisahu@chromium.org
per-file task_ids.h=*
# COMPONENT: Internals>BackgroundTaskScheduler
-
+# TEAM: clank-dev@google.com
+# OS: Android
diff --git a/chromium/components/background_task_scheduler/internal/BUILD.gn b/chromium/components/background_task_scheduler/internal/BUILD.gn
index ac59b8a007a..1ce3ec4bf86 100644
--- a/chromium/components/background_task_scheduler/internal/BUILD.gn
+++ b/chromium/components/background_task_scheduler/internal/BUILD.gn
@@ -36,7 +36,7 @@ if (is_android) {
"//components/background_task_scheduler:public_java",
"//content/public/android:content_java",
"//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+ "//third_party/android_deps:protobuf_lite_runtime_java",
]
}
@@ -107,6 +107,7 @@ if (is_android) {
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
"//components/background_task_scheduler:public_java",
"//content/public/test/android:content_java_test_support",
+ "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
"//third_party/junit",
]