Source release v2.1.5-0-811 + third_party libs

Change-Id: Ic8eafba071e486e671257bc22a8208e86d68b08a

platforms/global_config.gypi

@@ -12,13 +12,29 @@
     'buildinfo_data%': '"UndefinedBuildInfo"',
     'oemcrypto_target%': '../oemcrypto/mock/oec_mock.gyp:oec_mock',
     'oemcrypto_v8%': 'false',
-    'protobuf_source_dir%': '',
-    'use_system_protobuf%': 'true',
-    'protoc_dir%': '/usr/bin',
     'certificate_provision%': 'false',
     'force_use_of_secure_buffers%': 'false',
     'disable_privacy_crypto%': 'false',
-    'protobuf_gyp%': '<(DEPTH)/third_party/protobuf.gyp',
+
+    # There are three protobuf configurations:
+    #
+    # 1) protobuf_lib_type == 'system'
+    # Use a system-wide installation of protobuf.
+    # Specify the protobuf library in protobuf_lib.
+    # Specify the path to protoc in protoc_dir.
+    #
+    # 2) protobuf_lib_type == 'target'
+    # Use an existing protobuf gyp target from your project.
+    # Specify the protobuf gyp file and target in protobuf_lib.
+    # Specify the path to protoc in protoc_dir.
+    #
+    # 3) protobuf_lib_type == 'source'
+    # Build protobuf and protoc from source.
+    # Specify the path to the protobuf source in protobuf_lib.
+    # Make sure that a valid config.h for your target is in the source tree.
+    'protobuf_lib_type%': 'system',
+    'protobuf_lib%': '-lprotobuf',
+    'protoc_dir%': '/usr/bin',
   }, # end variables
 
   'target_defaults': {