From 292e192f17b5cf46a485cd497e92b6b11f492f7b Mon Sep 17 00:00:00 2001
From: kjellander <kjellander@webrtc.org>
Date: Wed, 13 Jan 2016 05:46:58 -0800
Subject: [PATCH] Add build_protobuf variable.

This makes it possible to use protobuffers with
an external protobuf library instead of the one that
comes with the WebRTC code.

NOTRY=True

Review URL: https://codereview.webrtc.org/1589433002

Cr-Commit-Position: refs/heads/master@{#11236}
---
 webrtc/build/common.gypi |  1 +
 webrtc/build/protoc.gypi | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 9fa3ce3193..8d8583f9a4 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -91,6 +91,7 @@
     'build_libyuv%': 1,
     'build_openmax_dl%': 1,
     'build_opus%': 1,
+    'build_protobuf%': 1,
     'build_ssl%': 1,
 
     # Disable by default
diff --git a/webrtc/build/protoc.gypi b/webrtc/build/protoc.gypi
index 5e486f16c2..682bc22cc5 100644
--- a/webrtc/build/protoc.gypi
+++ b/webrtc/build/protoc.gypi
@@ -109,10 +109,6 @@
       'process_outputs_as_sources': 1,
     },
   ],
-  'dependencies': [
-    '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
-    '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',
-  ],
   'include_dirs': [
     '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     '<(DEPTH)',
@@ -123,12 +119,20 @@
       '<(DEPTH)',
     ]
   },
-  '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',
-  ],
   # This target exports a hard dependency because it generates header
   # files.
   'hard_dependency': 1,
+  'conditions': [
+    ['build_protobuf==1', {
+      'dependencies': [
+        '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
+        '<(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',
+      ],
+    }],
+  ],
 }