From db7bebe3fa776d523d329a9f0a20bd8e63ef4253 Mon Sep 17 00:00:00 2001
From: Anders Hasselqvist <anders.hasselqvist@gmail.com>
Date: Fri, 15 Jan 2016 23:57:20 +0900
Subject: [PATCH] MacOSX: Solve libbase.a conflict link error

On Linux the generated ninja files use path/libbase.a as target name.
In the Mac ninja file the target is just libbase.a.
As we have two libbase.a (base/base.gyp and media/base/media_base.gyp) the linking stage fails to include both libs.

Solve by renaming media_base.gyp's base target to media_base
---
 packager/media/base/media_base.gyp       | 4 ++--
 packager/media/event/media_event.gyp     | 2 +-
 packager/media/file/file.gyp             | 2 +-
 packager/media/filters/filters.gyp       | 2 +-
 packager/media/formats/mp2t/mp2t.gyp     | 2 +-
 packager/media/formats/mp4/mp4.gyp       | 2 +-
 packager/media/formats/webm/webm.gyp     | 2 +-
 packager/media/formats/webvtt/webvtt.gyp | 2 +-
 packager/media/formats/wvm/wvm.gyp       | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packager/media/base/media_base.gyp b/packager/media/base/media_base.gyp
index 9b28871d95..d630676a09 100644
--- a/packager/media/base/media_base.gyp
+++ b/packager/media/base/media_base.gyp
@@ -10,7 +10,7 @@
   ],
   'targets': [
     {
-      'target_name': 'base',
+      'target_name': 'media_base',
       'type': '<(component)',
       'sources': [
         'aes_encryptor.cc',
@@ -132,7 +132,7 @@
         '../../third_party/boringssl/boringssl.gyp:boringssl',
         '../file/file.gyp:file',
         '../test/media_test.gyp:media_test_support',
-        'base',
+        'media_base',
       ],
     },
   ],
diff --git a/packager/media/event/media_event.gyp b/packager/media/event/media_event.gyp
index af4119eee2..039ab2c841 100644
--- a/packager/media/event/media_event.gyp
+++ b/packager/media/event/media_event.gyp
@@ -25,7 +25,7 @@
         '../../mpd/mpd.gyp:media_info_proto',
         # Depends on full protobuf to read/write with TextFormat.
         '../../third_party/protobuf/protobuf.gyp:protobuf_full_do_not_use',
-        '../base/media_base.gyp:base',
+        '../base/media_base.gyp:media_base',
         '../file/file.gyp:file',
       ],
     },
diff --git a/packager/media/file/file.gyp b/packager/media/file/file.gyp
index 8164ce3845..e92049b086 100644
--- a/packager/media/file/file.gyp
+++ b/packager/media/file/file.gyp
@@ -40,7 +40,7 @@
       'dependencies': [
         '../../base/base.gyp:base',
         '../../third_party/gflags/gflags.gyp:gflags',
-        '../base/media_base.gyp:base',
+        '../base/media_base.gyp:media_base',
       ],
     },
     {
diff --git a/packager/media/filters/filters.gyp b/packager/media/filters/filters.gyp
index 0c775555f3..a3abafa453 100644
--- a/packager/media/filters/filters.gyp
+++ b/packager/media/filters/filters.gyp
@@ -49,7 +49,7 @@
         'vp9_parser_unittest.cc',
       ],
       'dependencies': [
-        '../../media/base/media_base.gyp:base',
+        '../../media/base/media_base.gyp:media_base',
         '../../testing/gmock.gyp:gmock',
         '../../testing/gtest.gyp:gtest',
         '../test/media_test.gyp:media_test_support',
diff --git a/packager/media/formats/mp2t/mp2t.gyp b/packager/media/formats/mp2t/mp2t.gyp
index 640241ba9f..137c40bb46 100644
--- a/packager/media/formats/mp2t/mp2t.gyp
+++ b/packager/media/formats/mp2t/mp2t.gyp
@@ -34,7 +34,7 @@
         'ts_section_psi.h',
       ],
       'dependencies': [
-        '../../base/media_base.gyp:base',
+        '../../base/media_base.gyp:media_base',
       ],
     },
     {
diff --git a/packager/media/formats/mp4/mp4.gyp b/packager/media/formats/mp4/mp4.gyp
index d7b25da6f6..c26ca025a9 100644
--- a/packager/media/formats/mp4/mp4.gyp
+++ b/packager/media/formats/mp4/mp4.gyp
@@ -55,7 +55,7 @@
       ],
       'dependencies': [
         '../../../third_party/boringssl/boringssl.gyp:boringssl',
-        '../../base/media_base.gyp:base',
+        '../../base/media_base.gyp:media_base',
         '../../event/media_event.gyp:media_event',
         '../../filters/filters.gyp:filters',
       ],
diff --git a/packager/media/formats/webm/webm.gyp b/packager/media/formats/webm/webm.gyp
index 53bc0660d3..26304676e5 100644
--- a/packager/media/formats/webm/webm.gyp
+++ b/packager/media/formats/webm/webm.gyp
@@ -57,7 +57,7 @@
       'dependencies': [
         '../../../third_party/boringssl/boringssl.gyp:boringssl',
         '../../../third_party/libwebm/libwebm.gyp:libwebm',
-        '../../base/media_base.gyp:base',
+        '../../base/media_base.gyp:media_base',
         '../../base/media_base.gyp:widevine_pssh_data_proto',
         '../../filters/filters.gyp:filters'
       ],
diff --git a/packager/media/formats/webvtt/webvtt.gyp b/packager/media/formats/webvtt/webvtt.gyp
index c2f88bde8a..2f686be703 100644
--- a/packager/media/formats/webvtt/webvtt.gyp
+++ b/packager/media/formats/webvtt/webvtt.gyp
@@ -18,7 +18,7 @@
       ],
       'dependencies': [
         '../../../base/base.gyp:base',
-        '../../base/media_base.gyp:base',
+        '../../base/media_base.gyp:media_base',
       ],
     },
     {
diff --git a/packager/media/formats/wvm/wvm.gyp b/packager/media/formats/wvm/wvm.gyp
index 8f838285a4..910b0ca250 100644
--- a/packager/media/formats/wvm/wvm.gyp
+++ b/packager/media/formats/wvm/wvm.gyp
@@ -17,7 +17,7 @@
         'wvm_media_parser.h',
       ],
       'dependencies': [
-        '../../base/media_base.gyp:base',
+        '../../base/media_base.gyp:media_base',
         '../../filters/filters.gyp:filters',
         '../../formats/mp2t/mp2t.gyp:mp2t',
         '../../formats/mp4/mp4.gyp:mp4',