BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 2 insertions, 15 deletions

diff --git a/chromium/build/protoc_java.py b/chromium/build/protoc_java.py
index 62b012e2861..e6147d8b845 100755
--- a/chromium/build/protoc_java.py
+++ b/chromium/build/protoc_java.py
@@ -37,8 +37,6 @@ def main(argv):
   parser.add_option("--stamp", help="File to touch on success.")
   parser.add_option("--nano",
       help="Use to generate nano protos.", action='store_true')
-  parser.add_option("--protoc-javalite-plugin-dir",
-                    help="Path to protoc java lite plugin directory.")
   parser.add_option("--import-dir", action="append", default=[],
                     help="Extra import directory for protos, can be repeated.")
   options, args = parser.parse_args(argv)
@@ -59,21 +57,11 @@ def main(argv):
                         'store_unknown_fields=true']
       out_arg = '--javanano_out=' + ','.join(generator_args) + ':' + temp_dir
     else:
-      out_arg = '--javalite_out=' + temp_dir
-
-    custom_env = os.environ.copy()
-    if options.protoc_javalite_plugin_dir:
-      # If we are generating lite protos, then the lite plugin needs to be in
-      # the path when protoc is called. See
-      # https://github.com/protocolbuffers/protobuf/blob/master/java/lite.md
-      custom_env['PATH'] = '{}:{}'.format(
-          os.path.abspath(options.protoc_javalite_plugin_dir),
-          custom_env['PATH'])
+      out_arg = '--java_out=lite:' + temp_dir
 
     # Generate Java files using protoc.
     build_utils.CheckOutput(
         [options.protoc] + proto_path_args + [out_arg] + args,
-        env=custom_env,
         # protoc generates superfluous warnings about LITE_RUNTIME deprecation
         # even though we are using the new non-deprecated method.
         stderr_filter=lambda output: build_utils.FilterLines(
@@ -89,8 +77,7 @@ def main(argv):
   if options.depfile:
     assert options.srcjar
     deps = args + [options.protoc]
-    build_utils.WriteDepfile(options.depfile, options.srcjar, deps,
-                             add_pydeps=False)
+    build_utils.WriteDepfile(options.depfile, options.srcjar, deps)
 
   if options.stamp:
     build_utils.Touch(options.stamp)