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

webrtc/build/protoc.gypi

Index: webrtc/build/protoc.gypi
diff --git a/webrtc/build/protoc.gypi b/webrtc/build/protoc.gypi
index 6e9af457aafe850b798654aac74c19f59bd44a4c..df209d47de8da910fdf70dab12fa5dce7d508558 100644
--- a/webrtc/build/protoc.gypi
+++ b/webrtc/build/protoc.gypi
@@ -94,21 +94,16 @@
       '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,