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

Change-Id: Ic8eafba071e486e671257bc22a8208e86d68b08a

third_party/protoc.gypi

@@ -1,25 +1,42 @@
 # Copyright 2014 Google Inc. All rights reserved.
 {
   'variables': {
-    'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out/<(proto_out_dir)',
+    'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'proto_in_dir%': '.',
   },
   'conditions': [
-    ['use_system_protobuf=="false"', {
-      'variables': {
-        'protoc_dir': '<(PRODUCT_DIR)',
+    ['protobuf_lib_type=="system"', {
+      # protobuf_lib is a library setting.
+      'direct_dependent_settings': {
+        'libraries': [
+          '<(protobuf_lib)',
+        ],
       },
+    }],
+    ['protobuf_lib_type=="target"', {
+      # protobuf_lib is a gyp target.
       'dependencies': [
-        '<(protobuf_gyp):protoc#host',
-        '<(protobuf_gyp):protobuf_lite',
+        '<(protobuf_lib)',
       ],
       'export_dependent_settings': [
-        # Direct dependents of protobuf_lite have the correct protobuf include
-        # path, so export this as a dep to anyone who depends on the sources
-        # generated by this target.
-        '<(protobuf_gyp):protobuf_lite',
+        '<(protobuf_lib)',
       ],
     }],
+    ['protobuf_lib_type=="source"', {
+      # protobuf_lib is a source folder.
+      # We use protobuf.gyp to describe the build.
+      'dependencies': [
+        '../third_party/protobuf.gyp:protoc#host',
+        '../third_party/protobuf.gyp:protobuf_lite',
+      ],
+      'export_dependent_settings': [
+        '../third_party/protobuf.gyp:protobuf_lite',
+      ],
+      'variables': {
+        # Since we are building our own protoc, override protoc_dir.
+        'protoc_dir': '<(PRODUCT_DIR)',
+      },
+    }],
   ],
   'rules': [
     {
@@ -42,12 +59,10 @@
     },
   ],
   'include_dirs': [
-    '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
-    '<(proto_out_dir)',
+    '<(cc_dir)',
   ],
   'direct_dependent_settings': {
     'include_dirs': [
-      '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
       '<(cc_dir)',
     ]
   },