Added libwebm and webm-tools to imports

b/25089850

Change-Id: If97fc4dec70c3c94054b0f7ec5f243d9d5bd676e

.gitignore

@@ -17,9 +17,11 @@
 /packager/third_party/gflags/
 /packager/third_party/gold/
 /packager/third_party/icu/
+/packager/third_party/libwebm/src/
 /packager/third_party/llvm-build/
 /packager/third_party/modp_b64/
 /packager/third_party/openssl/
+/packager/third_party/webm-tools/src/
 /packager/third_party/yasm/source/patched-yasm/
 /packager/third_party/zlib/
 /packager/tools/clang/

DEPS

@@ -48,9 +48,15 @@ deps = {
   "src/packager/third_party/icu":
     Var("chromium_git") + "/chromium/third_party/icu46@78597121d71a5922f5726e715c6ad06c50ae6cdc",
 
+  "src/packager/third_party/libwebm/src":
+    Var("chromium_git") + "/webm/libwebm@1ad314e297a43966605c4ef23a6442bb58e1d9be",
+
   "src/packager/third_party/modp_b64":
     Var("chromium_git") + "/chromium/src/third_party/modp_b64@3a0e3b4ef6c54678a2d14522533df56b33b56119",
 
+  "src/packager/third_party/webm-tools/src":
+    Var("chromium_git") + "/webm/webm-tools@702ff3e4bb462b24464a202f8fcf9f65cc44b6e5",
+
   "src/packager/tools/clang":
     Var("chromium_git") + "/chromium/src/tools/clang@0de8f3bb6af64e13876273c601704795d5e00faf",
 

packager/media/formats/webm/webm.gyp

@@ -39,6 +39,7 @@
         'webm_webvtt_parser.h'
       ],
       'dependencies': [
+        '../../../third_party/libwebm/libwebm.gyp:libwebm',
         '../../base/media_base.gyp:base',
       ],
     },

packager/third_party/libwebm/libwebm.gyp

@@ -0,0 +1,24 @@
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+{
+  'includes': [
+  ],
+  'targets': [
+    {
+      'target_name': 'libwebm',
+      'type': 'static_library',
+      'sources': [
+        'src/mkvmuxer.cpp',
+        'src/mkvmuxer.hpp',
+        'src/mkvmuxerutil.cpp',
+        'src/mkvmuxerutil.hpp',
+        'src/mkvwriter.cpp',
+        'src/mkvwriter.hpp',
+      ],
+    },
+  ],
+}