| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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=="linux"', { | 6 ['OS=="linux"', { |
| 7 'variables': { | 7 'variables': { |
| 8 'files': [ | 8 'files': [ |
| 9 '<(PRODUCT_DIR)/libffmpegsumo.so', | 9 '<(PRODUCT_DIR)/libffmpegsumo.so', |
| 10 '<(PRODUCT_DIR)/libosmesa.so', | 10 '<(PRODUCT_DIR)/libosmesa.so', |
| 11 ], | 11 ], |
| 12 }, | 12 }, |
| 13 }], | 13 }], |
| 14 ['disable_nacl==0 and OS=="linux"', { | 14 ['disable_nacl==0 and OS=="linux"', { |
| 15 'variables': { | 15 'variables': { |
| 16 'files': [ | 16 'files': [ |
| 17 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', | 17 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', |
| 18 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', | 18 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', |
| 19 ] | 19 ] |
| 20 } | 20 } |
| 21 }], | 21 }], |
| 22 # TODO(hidehiko,mazda): Include nacl_helper_nonsfi for ARM when supported. | |
| 23 ['disable_nacl==0 and OS=="linux" and ' | 22 ['disable_nacl==0 and OS=="linux" and ' |
| 24 '(target_arch=="x64" or target_arch=="ia32")', { | 23 '(target_arch=="x64" or target_arch=="ia32" or target_arch=="arm")', { |
| 25 'variables': { | 24 'variables': { |
| 26 'files': [ | 25 'files': [ |
| 27 '<(PRODUCT_DIR)/nacl_helper_nonsfi<(EXECUTABLE_SUFFIX)', | 26 '<(PRODUCT_DIR)/nacl_helper_nonsfi<(EXECUTABLE_SUFFIX)', |
| 28 ] | 27 ] |
| 29 } | 28 } |
| 30 }], | 29 }], |
| 31 ['OS=="linux" or OS=="mac" or OS=="win"', { | 30 ['OS=="linux" or OS=="mac" or OS=="win"', { |
| 32 'variables': { | 31 'variables': { |
| 33 'files': [ | 32 'files': [ |
| 34 '<(PRODUCT_DIR)/resources.pak', | 33 '<(PRODUCT_DIR)/resources.pak', |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 '<(PRODUCT_DIR)/chrome_child.dll', | 111 '<(PRODUCT_DIR)/chrome_child.dll', |
| 113 ], | 112 ], |
| 114 }, | 113 }, |
| 115 }], | 114 }], |
| 116 ], | 115 ], |
| 117 'includes': [ | 116 'includes': [ |
| 118 'angle.isolate', | 117 'angle.isolate', |
| 119 '../gin/v8.isolate', | 118 '../gin/v8.isolate', |
| 120 ], | 119 ], |
| 121 } | 120 } |
| OLD | NEW |