Source release v2.1.4-0-804 + third_party libs

Change-Id: I1db8582efba613fa8a2b91a9c2697c5dfb2a8abf
2014-07-02 09:27:29 -07:00
parent 84acd5a15e
commit 334525c8a5
22 changed files with 1090 additions and 271 deletions
--- a/third_party/protoc.gypi
+++ b/third_party/protoc.gypi
@@ -10,14 +10,14 @@
        'protoc_dir': '<(PRODUCT_DIR)',
      },
      'dependencies': [
-        '<(DEPTH)/third_party/protobuf.gyp:protoc#host',
-        '<(DEPTH)/third_party/protobuf.gyp:protobuf_lite',
+        '<(protobuf_gyp):protoc#host',
+        '<(protobuf_gyp):protobuf_lite',
      ],
      '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.
-        '<(DEPTH)/third_party/protobuf.gyp:protobuf_lite',
+        '<(protobuf_gyp):protobuf_lite',
      ],
    }],
  ],