Commit 295a1b1a authored by John Abd-El-Malek's avatar John Abd-El-Malek

More fixes to make 32 bit Linux builds pass compile.

This is breaking after r295514 which enforces that every file listed in an isolate file exists.

BUG=414808
R=erg@chromium.org

Review URL: https://codereview.chromium.org/585673002

Cr-Commit-Position: refs/heads/master@{#295589}
parent 51b00db2
...@@ -84,6 +84,12 @@ ...@@ -84,6 +84,12 @@
], ],
'isolate_dependency_untracked': [ 'isolate_dependency_untracked': [
'../third_party/bidichecker/', '../third_party/bidichecker/',
],
},
}],
['OS=="win" or (OS=="linux" and target_arch=="x64")', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/lib64/', '<(PRODUCT_DIR)/lib64/',
], ],
}, },
......
...@@ -19,12 +19,18 @@ ...@@ -19,12 +19,18 @@
'../xvfb.py', '../xvfb.py',
'<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so', '<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
], ],
}, },
}], }],
['OS=="linux" or OS=="mac" or OS=="win"', { ['OS=="linux" and target_arch=="x64"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': { 'variables': {
'isolate_dependency_tracked': [ 'isolate_dependency_tracked': [
'../test_env.py', '../test_env.py',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment