Roll chromium_revision e3860bd297..938114be1e (412289:414059)

webrtc/build/protoc.gypi

 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 # Copied from Chromium's src/build/protoc.gypi
 #
@@ skipping 76 matching lines @@
         '<(protoc)',
       ],
       'outputs': [
         '<(py_dir)/<(RULE_INPUT_ROOT)_pb2.py',
         '<(cc_dir)/<(RULE_INPUT_ROOT).pb.cc',
         '<(cc_dir)/<(RULE_INPUT_ROOT).pb.h',
       ],
       'action': [
         'python',
         '<(protoc_wrapper)',
-        '--include',
-        '<(cc_include)',
-        '--protobuf',
-        '<(cc_dir)/<(RULE_INPUT_ROOT).pb.h',
+        '--protoc',
+        '<(protoc)',
         # Using the --arg val form (instead of --arg=val) allows gyp's msvs rule
         # generation to correct 'val' which is a path.
         '--proto-in-dir','<(proto_in_dir)',
         # Naively you'd use <(RULE_INPUT_PATH) here, but protoc requires
         # --proto_path is a strict prefix of the path given as an argument.
-        '--proto-in-file','<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
-        '--use-system-protobuf=<(use_system_protobuf)',
-        '--',
-        '<(protoc)',
-        '--cpp_out', '<(cc_generator_options)<(cc_dir)',
-        '--python_out', '<(py_dir)',
+        '--cc-out-dir', '<(cc_generator_options)<(cc_dir)',
+        '--py-out-dir', '<(py_dir)',
+        '<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
       ],
       'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)',
       'process_outputs_as_sources': 1,
     },
   ],
   'include_dirs': [
     '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
   ],
   'direct_dependent_settings': {
     'include_dirs': [
@@ skipping 10 matching lines @@
         '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
       ],
       'export_dependent_settings': [
         # The generated headers reference headers within protobuf_lite,
         # so dependencies must be able to find those headers too.
         '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
       ],
     }],
   ],
 }