| 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 'conditions': [ | 5 'conditions': [ |
| 6 ['OS=="mac" or OS=="win"', { | 6 ['OS=="mac" or OS=="win"', { |
| 7 'targets': [ | 7 'targets': [ |
| 8 { | 8 { |
| 9 'target_name': 'chrome_dll', | 9 'target_name': 'chrome_dll', |
| 10 'type': 'none', | 10 'type': 'none', |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 # Bring in pdfsqueeze and run it on all pdfs | 261 # Bring in pdfsqueeze and run it on all pdfs |
| 262 '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze', | 262 '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze', |
| 263 '../crypto/crypto.gyp:crypto', | 263 '../crypto/crypto.gyp:crypto', |
| 264 # On Mac, Flash gets put into the framework, so we need this | 264 # On Mac, Flash gets put into the framework, so we need this |
| 265 # dependency here. flash_player.gyp will copy the Flash bundle | 265 # dependency here. flash_player.gyp will copy the Flash bundle |
| 266 # into PRODUCT_DIR. | 266 # into PRODUCT_DIR. |
| 267 # TODO(viettrungluu): Once enabled for Mac, Flapper binaries | 267 # TODO(viettrungluu): Once enabled for Mac, Flapper binaries |
| 268 # will also need to be put into the bundle. | 268 # will also need to be put into the bundle. |
| 269 '../third_party/adobe/flash/flash_player.gyp:flash_player', | 269 '../third_party/adobe/flash/flash_player.gyp:flash_player', |
| 270 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries', | 270 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries', |
| 271 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmplugin'
, | |
| 272 'chrome_resources.gyp:packed_extra_resources', | 271 'chrome_resources.gyp:packed_extra_resources', |
| 273 'chrome_resources.gyp:packed_resources', | 272 'chrome_resources.gyp:packed_resources', |
| 274 ], | 273 ], |
| 275 'rules': [ | 274 'rules': [ |
| 276 { | 275 { |
| 277 'rule_name': 'pdfsqueeze', | 276 'rule_name': 'pdfsqueeze', |
| 278 'extension': 'pdf', | 277 'extension': 'pdf', |
| 279 'inputs': [ | 278 'inputs': [ |
| 280 '<(PRODUCT_DIR)/pdfsqueeze', | 279 '<(PRODUCT_DIR)/pdfsqueeze', |
| 281 ], | 280 ], |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Interne
t Plug-Ins/PepperFlash', | 374 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Interne
t Plug-Ins/PepperFlash', |
| 376 'files': [], | 375 'files': [], |
| 377 'conditions': [ | 376 'conditions': [ |
| 378 ['branding == "Chrome"', { | 377 ['branding == "Chrome"', { |
| 379 'files': [ | 378 'files': [ |
| 380 '<(PRODUCT_DIR)/PepperFlash/PepperFlashPlayer.plugin', | 379 '<(PRODUCT_DIR)/PepperFlash/PepperFlashPlayer.plugin', |
| 381 ], | 380 ], |
| 382 }], | 381 }], |
| 383 ], | 382 ], |
| 384 }, | 383 }, |
| 385 # TODO(ddorwin): Include CDM files in the Mac bundle. | |
| 386 { | 384 { |
| 387 # Copy of resources used by tests. | 385 # Copy of resources used by tests. |
| 388 'destination': '<(PRODUCT_DIR)', | 386 'destination': '<(PRODUCT_DIR)', |
| 389 'files': [ | 387 'files': [ |
| 390 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak' | 388 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak' |
| 391 ], | 389 ], |
| 392 }, | 390 }, |
| 393 { | 391 { |
| 394 # Copy of resources used by tests. | 392 # Copy of resources used by tests. |
| 395 'destination': '<(PRODUCT_DIR)/pseudo_locales', | 393 'destination': '<(PRODUCT_DIR)/pseudo_locales', |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 ], | 492 ], |
| 495 }], | 493 }], |
| 496 ], # conditions | 494 ], # conditions |
| 497 }], # OS=="mac" | 495 }], # OS=="mac" |
| 498 ], # conditions | 496 ], # conditions |
| 499 }, # target chrome_dll | 497 }, # target chrome_dll |
| 500 ], # targets | 498 ], # targets |
| 501 }], # OS=="mac" or OS=="win" | 499 }], # OS=="mac" or OS=="win" |
| 502 ], | 500 ], |
| 503 } | 501 } |
| OLD | NEW |