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
This commit is contained in:
parent
209b29a20b
commit
db7bebe3fa
|
@ -10,7 +10,7 @@
|
||||||
],
|
],
|
||||||
'targets': [
|
'targets': [
|
||||||
{
|
{
|
||||||
'target_name': 'base',
|
'target_name': 'media_base',
|
||||||
'type': '<(component)',
|
'type': '<(component)',
|
||||||
'sources': [
|
'sources': [
|
||||||
'aes_encryptor.cc',
|
'aes_encryptor.cc',
|
||||||
|
@ -132,7 +132,7 @@
|
||||||
'../../third_party/boringssl/boringssl.gyp:boringssl',
|
'../../third_party/boringssl/boringssl.gyp:boringssl',
|
||||||
'../file/file.gyp:file',
|
'../file/file.gyp:file',
|
||||||
'../test/media_test.gyp:media_test_support',
|
'../test/media_test.gyp:media_test_support',
|
||||||
'base',
|
'media_base',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
'../../mpd/mpd.gyp:media_info_proto',
|
'../../mpd/mpd.gyp:media_info_proto',
|
||||||
# Depends on full protobuf to read/write with TextFormat.
|
# Depends on full protobuf to read/write with TextFormat.
|
||||||
'../../third_party/protobuf/protobuf.gyp:protobuf_full_do_not_use',
|
'../../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',
|
'../file/file.gyp:file',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'../../base/base.gyp:base',
|
'../../base/base.gyp:base',
|
||||||
'../../third_party/gflags/gflags.gyp:gflags',
|
'../../third_party/gflags/gflags.gyp:gflags',
|
||||||
'../base/media_base.gyp:base',
|
'../base/media_base.gyp:media_base',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
'vp9_parser_unittest.cc',
|
'vp9_parser_unittest.cc',
|
||||||
],
|
],
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'../../media/base/media_base.gyp:base',
|
'../../media/base/media_base.gyp:media_base',
|
||||||
'../../testing/gmock.gyp:gmock',
|
'../../testing/gmock.gyp:gmock',
|
||||||
'../../testing/gtest.gyp:gtest',
|
'../../testing/gtest.gyp:gtest',
|
||||||
'../test/media_test.gyp:media_test_support',
|
'../test/media_test.gyp:media_test_support',
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
'ts_section_psi.h',
|
'ts_section_psi.h',
|
||||||
],
|
],
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'../../base/media_base.gyp:base',
|
'../../base/media_base.gyp:media_base',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
],
|
],
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'../../../third_party/boringssl/boringssl.gyp:boringssl',
|
'../../../third_party/boringssl/boringssl.gyp:boringssl',
|
||||||
'../../base/media_base.gyp:base',
|
'../../base/media_base.gyp:media_base',
|
||||||
'../../event/media_event.gyp:media_event',
|
'../../event/media_event.gyp:media_event',
|
||||||
'../../filters/filters.gyp:filters',
|
'../../filters/filters.gyp:filters',
|
||||||
],
|
],
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'../../../third_party/boringssl/boringssl.gyp:boringssl',
|
'../../../third_party/boringssl/boringssl.gyp:boringssl',
|
||||||
'../../../third_party/libwebm/libwebm.gyp:libwebm',
|
'../../../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',
|
'../../base/media_base.gyp:widevine_pssh_data_proto',
|
||||||
'../../filters/filters.gyp:filters'
|
'../../filters/filters.gyp:filters'
|
||||||
],
|
],
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
],
|
],
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'../../../base/base.gyp:base',
|
'../../../base/base.gyp:base',
|
||||||
'../../base/media_base.gyp:base',
|
'../../base/media_base.gyp:media_base',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
'wvm_media_parser.h',
|
'wvm_media_parser.h',
|
||||||
],
|
],
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'../../base/media_base.gyp:base',
|
'../../base/media_base.gyp:media_base',
|
||||||
'../../filters/filters.gyp:filters',
|
'../../filters/filters.gyp:filters',
|
||||||
'../../formats/mp2t/mp2t.gyp:mp2t',
|
'../../formats/mp2t/mp2t.gyp:mp2t',
|
||||||
'../../formats/mp4/mp4.gyp:mp4',
|
'../../formats/mp4/mp4.gyp:mp4',
|
||||||
|
|
Loading…
Reference in New Issue