| 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 | 9 |
| 10 'includes': [ | 10 'includes': [ |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 }, | 60 }, |
| 61 'targets': [ | 61 'targets': [ |
| 62 { | 62 { |
| 63 'target_name': 'common_constants', | 63 'target_name': 'common_constants', |
| 64 'type': 'static_library', | 64 'type': 'static_library', |
| 65 'include_dirs': [ | 65 'include_dirs': [ |
| 66 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc. | 66 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc. |
| 67 ], | 67 ], |
| 68 'dependencies': [ | 68 'dependencies': [ |
| 69 '../base/base.gyp:base', | 69 '../base/base.gyp:base', |
| 70 '../components/nacl_common.gypi:nacl_switches', |
| 70 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', | 71 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', |
| 71 ], | 72 ], |
| 72 'target_conditions': [ | 73 'target_conditions': [ |
| 73 ['OS=="ios"', { | 74 ['OS=="ios"', { |
| 74 # iOS needs chrome_paths_mac, which is excluded by filename rules; | 75 # iOS needs chrome_paths_mac, which is excluded by filename rules; |
| 75 # re-add it in target_conditionals so it's after that exclusion. | 76 # re-add it in target_conditionals so it's after that exclusion. |
| 76 'sources/': [ | 77 'sources/': [ |
| 77 ['include', '^common/chrome_paths_mac\\.mm$'], | 78 ['include', '^common/chrome_paths_mac\\.mm$'], |
| 78 ], | 79 ], |
| 79 }], | 80 }], |
| 80 ], | 81 ], |
| 81 'conditions': [ | 82 'conditions': [ |
| 82 ['toolkit_uses_gtk == 1', { | 83 ['toolkit_uses_gtk == 1', { |
| 83 'dependencies': ['../build/linux/system.gyp:gtk'], | 84 'dependencies': ['../build/linux/system.gyp:gtk'], |
| 84 }], | 85 }], |
| 85 ], | 86 ], |
| 86 }, | 87 }, |
| 87 ], | 88 ], |
| 88 'conditions': [ | 89 'conditions': [ |
| 89 ['OS=="win" and target_arch=="ia32"', { | 90 ['OS=="win" and target_arch=="ia32"', { |
| 90 'targets': [ | 91 'targets': [ |
| 91 { | 92 { |
| 92 'target_name': 'common_constants_win64', | 93 'target_name': 'common_constants_win64', |
| 93 'type': 'static_library', | 94 'type': 'static_library', |
| 94 'include_dirs': [ | 95 'include_dirs': [ |
| 95 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc. | 96 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc. |
| 96 ], | 97 ], |
| 97 'dependencies': [ | 98 'dependencies': [ |
| 98 '../base/base.gyp:base_nacl_win64', | 99 '../base/base.gyp:base_nacl_win64', |
| 100 '../components/nacl_common.gypi:nacl_switches_win64', |
| 99 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h
', | 101 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h
', |
| 100 ], | 102 ], |
| 101 'defines': [ | 103 'defines': [ |
| 102 '<@(nacl_win64_defines)', | 104 '<@(nacl_win64_defines)', |
| 103 'COMPILE_CONTENT_STATICALLY', | 105 'COMPILE_CONTENT_STATICALLY', |
| 104 ], | 106 ], |
| 105 'configurations': { | 107 'configurations': { |
| 106 'Common_Base': { | 108 'Common_Base': { |
| 107 'msvs_target_platform': 'x64', | 109 'msvs_target_platform': 'x64', |
| 108 }, | 110 }, |
| 109 }, | 111 }, |
| 110 }, | 112 }, |
| 111 ], | 113 ], |
| 112 }], | 114 }], |
| 113 ], | 115 ], |
| 114 } | 116 } |
| OLD | NEW |