From cb8de4c2f45562ab1860f77778bc5001002d18b3 Mon Sep 17 00:00:00 2001 From: Anders Hasselqvist Date: Wed, 20 Jan 2016 10:57:44 +0900 Subject: [PATCH] MacOSX: Solve conflicting libwebm targets When generating ninja files we end up with two libwebm targets. packager/media/formats/webm/webm.gyp:webm -> becomes target libwebm packager/third_party/libwebm/libwebm.gyp:libwebm -> becomes target libwebm Solve this conflict by renaming libwebm.gyp:libwebm to mkvmuxer. --- packager/media/formats/webm/webm.gyp | 2 +- packager/third_party/libwebm/libwebm.gyp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packager/media/formats/webm/webm.gyp b/packager/media/formats/webm/webm.gyp index 26304676e5..6e03e911c4 100644 --- a/packager/media/formats/webm/webm.gyp +++ b/packager/media/formats/webm/webm.gyp @@ -56,7 +56,7 @@ ], 'dependencies': [ '../../../third_party/boringssl/boringssl.gyp:boringssl', - '../../../third_party/libwebm/libwebm.gyp:libwebm', + '../../../third_party/libwebm/libwebm.gyp:mkvmuxer', '../../base/media_base.gyp:media_base', '../../base/media_base.gyp:widevine_pssh_data_proto', '../../filters/filters.gyp:filters' diff --git a/packager/third_party/libwebm/libwebm.gyp b/packager/third_party/libwebm/libwebm.gyp index 91336b0653..882a43023f 100644 --- a/packager/third_party/libwebm/libwebm.gyp +++ b/packager/third_party/libwebm/libwebm.gyp @@ -9,7 +9,7 @@ ], 'targets': [ { - 'target_name': 'libwebm', + 'target_name': 'mkvmuxer', 'type': 'static_library', 'sources': [ 'src/mkvmuxer.cpp',