| 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 # This file contains resources for the main Mac chromium bundle. | 5 # This file contains resources for the main Mac chromium bundle. |
| 6 { | 6 { |
| 7 # The main browser executable's name is <(mac_product_name). | 7 # The main browser executable's name is <(mac_product_name). |
| 8 # Certain things will get confused if two modules in the | 8 # Certain things will get confused if two modules in the |
| 9 # executable share the same name, so append " Framework" to the | 9 # executable share the same name, so append " Framework" to the |
| 10 # product_name used for the framework. This will result in | 10 # product_name used for the framework. This will result in |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 'files': [], | 150 'files': [], |
| 151 'conditions': [ | 151 'conditions': [ |
| 152 ['internal_pdf', { | 152 ['internal_pdf', { |
| 153 'files': [ | 153 'files': [ |
| 154 '<(PRODUCT_DIR)/PDF.plugin', | 154 '<(PRODUCT_DIR)/PDF.plugin', |
| 155 ], | 155 ], |
| 156 }], | 156 }], |
| 157 ['disable_nacl!=1', { | 157 ['disable_nacl!=1', { |
| 158 'files': [ | 158 'files': [ |
| 159 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin', | 159 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin', |
| 160 # We leave out the x86-64 IRT nexe because we only | 160 ], |
| 161 # support x86-32 NaCl on Mac OS X. | 161 'conditions': [ |
| 162 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 162 ['target_arch=="x64"', { |
| 163 'files': [ |
| 164 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 165 ], |
| 166 }, { |
| 167 'files': [ |
| 168 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 169 ], |
| 170 }], |
| 163 ], | 171 ], |
| 164 }], | 172 }], |
| 165 ], | 173 ], |
| 166 }, | 174 }, |
| 167 { | 175 { |
| 168 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/P
epperFlash', | 176 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/P
epperFlash', |
| 169 'files': [], | 177 'files': [], |
| 170 'conditions': [ | 178 'conditions': [ |
| 171 ['branding == "Chrome"', { | 179 ['branding == "Chrome"', { |
| 172 'files': [ | 180 'files': [ |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 ], | 283 ], |
| 276 }], | 284 }], |
| 277 }], | 285 }], |
| 278 ['enable_hidpi==1', { | 286 ['enable_hidpi==1', { |
| 279 'mac_bundle_resources': [ | 287 'mac_bundle_resources': [ |
| 280 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', | 288 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', |
| 281 ], | 289 ], |
| 282 }], | 290 }], |
| 283 ], # conditions | 291 ], # conditions |
| 284 } | 292 } |
| OLD | NEW |