Source release v3.0.0-0-g8d3792b-ce + third_party

Change-Id: I399e71ddfffcd436171d1c60283c63ab4658e0b1

third_party/protoc.gypi

@@ -1,11 +1,11 @@
-# Copyright 2014 Google Inc. All rights reserved.
+# Copyright 2015 Google Inc. All rights reserved.
 {
   'variables': {
     'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'proto_in_dir%': '.',
   },
   'conditions': [
-    ['protobuf_lib_type=="system"', {
+    ['protobuf_config=="system"', {
       # protobuf_lib is a library setting.
       'direct_dependent_settings': {
         'libraries': [
@@ -13,30 +13,30 @@
         ],
       },
     }],
-    ['protobuf_lib_type=="target"', {
+    ['protobuf_config=="target"', {
       # protobuf_lib is a gyp target.
       'dependencies': [
-        '<(protobuf_lib)',
+        '<(protobuf_lib_target)',
         '<(protoc_host_target)',
       ],
       'export_dependent_settings': [
-        '<(protobuf_lib)',
+        '<(protobuf_lib_target)',
         '<(protoc_host_target)',
       ],
     }],
-    ['protobuf_lib_type=="source"', {
+    ['protobuf_config=="source"', {
       # protobuf_lib is a source folder.
-      # We use protobuf.gyp to describe the build.
+      # We use the targets in protobuf.gypi.
       'dependencies': [
-        '../third_party/protobuf.gyp:protoc#host',
-        '../third_party/protobuf.gyp:protobuf_lite',
+        'protoc#host',
+        'protobuf_lite',
       ],
       'export_dependent_settings': [
-        '../third_party/protobuf.gyp:protobuf_lite',
+        'protobuf_lite',
       ],
       'variables': {
-        # Since we are building our own protoc, override protoc_dir.
-        'protoc_dir': '<(PRODUCT_DIR)',
+        # Since we are building our own protoc, override protoc_bin.
+        'protoc_bin': '<(PRODUCT_DIR)/protoc',
       },
     }],
   ],
@@ -49,7 +49,7 @@
         '<(cc_dir)/<(RULE_INPUT_ROOT).pb.h',
       ],
       'action': [
-        '<(protoc_dir)/protoc',
+        '<(protoc_bin)',
         '--proto_path=<(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.