Commit b7704b43 authored by Mohamed Heikal's avatar Mohamed Heikal Committed by Commit Bot

Remove references to real protobuf runtime from gni files

Only depend on the aliased protobuf runtime rather than the real target.
This also updates a deprecated method usage (valueOf) since it is no
longer available in the latest runtime.

TBR=mechanical changes

Bug: 1114836
Change-Id: I8896cd81e17c4fbd9dc368b5906618fe743d124e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2357634
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: default avatarSam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798751}
parent 8ee23c83
...@@ -17,8 +17,8 @@ if (enable_feed_in_chrome) { ...@@ -17,8 +17,8 @@ if (enable_feed_in_chrome) {
"//third_party/android_deps:androidx_recyclerview_recyclerview_java", "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:androidx_swiperefreshlayout_swiperefreshlayout_java", "//third_party/android_deps:androidx_swiperefreshlayout_swiperefreshlayout_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
"//third_party/android_deps:javax_inject_javax_inject_java", "//third_party/android_deps:javax_inject_javax_inject_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
] ]
feed_java_sources = [ feed_java_sources = [
......
...@@ -91,7 +91,7 @@ public class SharingServiceProxy { ...@@ -91,7 +91,7 @@ public class SharingServiceProxy {
DeviceInfo device = new DeviceInfo(); DeviceInfo device = new DeviceInfo();
device.guid = guid; device.guid = guid;
device.clientName = clientName; device.clientName = clientName;
device.deviceType = SyncEnums.DeviceType.valueOf(deviceType); device.deviceType = SyncEnums.DeviceType.forNumber(deviceType);
device.lastUpdatedTimestampMillis = lastUpdatedTimestampMillis; device.lastUpdatedTimestampMillis = lastUpdatedTimestampMillis;
deviceInfo.add(device); deviceInfo.add(device);
} }
......
...@@ -92,7 +92,7 @@ template("remoting_android_client_java_tmpl") { ...@@ -92,7 +92,7 @@ template("remoting_android_client_java_tmpl") {
"//third_party/android_deps:androidx_drawerlayout_drawerlayout_java", "//third_party/android_deps:androidx_drawerlayout_drawerlayout_java",
"//third_party/android_deps:androidx_lifecycle_lifecycle_common_java", "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
"//third_party/android_deps:androidx_mediarouter_mediarouter_java", "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
"//third_party/android_deps:com_google_protobuf_protobuf_javalite_java", "//third_party/android_deps:protobuf_lite_runtime_java",
"//ui/android:ui_utils_java", "//ui/android:ui_utils_java",
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment