Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'webkit_media', | 8 'target_name': 'webkit_media', |
| 9 'type': 'static_library', | 9 'type': 'static_library', |
| 10 'variables': { 'enable_wexit_time_destructors': 1, }, | 10 'variables': { 'enable_wexit_time_destructors': 1, }, |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 71 'dependencies': [ | 71 'dependencies': [ |
| 72 '<(DEPTH)/media/media.gyp:player_android', | 72 '<(DEPTH)/media/media.gyp:player_android', |
| 73 ], | 73 ], |
| 74 }, { # OS != "android"' | 74 }, { # OS != "android"' |
| 75 'sources/': [ | 75 'sources/': [ |
| 76 ['exclude', '^android/'], | 76 ['exclude', '^android/'], |
| 77 ], | 77 ], |
| 78 }], | 78 }], |
| 79 ], | 79 ], |
| 80 }, | 80 }, |
| 81 { | |
| 82 'target_name': 'clear_key_cdm', | |
|
ddorwin
2012/08/15 20:15:00
should this use underscores or be concatenated? Th
xhwang
2012/08/16 02:32:40
On line 8, the target name for webkit_media is 'we
ddorwin
2012/08/16 05:00:35
webkit_media is a static library that we happen to
xhwang
2012/08/16 17:19:00
Done.
| |
| 83 'type': 'shared_library', | |
| 84 'dependencies': [ | |
| 85 '<(DEPTH)/base/base.gyp:base' | |
|
ddorwin
2012/08/15 20:15:00
+ webkit_media and media?
xhwang
2012/08/16 02:32:40
Added media, this shouldn't depend on webkit_media
| |
| 86 ], | |
| 87 'sources': [ | |
| 88 'crypto/clear_key_cdm.cc', | |
| 89 'crypto/clear_key_cdm.h', | |
| 90 ], | |
| 91 } | |
| 81 ], | 92 ], |
| 82 } | 93 } |
| OLD | NEW |