| Index: chrome/test/data/nacl/nacl_browser_test.gypi
|
| diff --git a/chrome/test/data/nacl/nacl_browser_test.gypi b/chrome/test/data/nacl/nacl_browser_test.gypi
|
| index ac39a1c3131a4de2f14130134b03b460467d5758..557acc2a4f176bf29ebb1e3e84ffc3727b61a294 100644
|
| --- a/chrome/test/data/nacl/nacl_browser_test.gypi
|
| +++ b/chrome/test/data/nacl/nacl_browser_test.gypi
|
| @@ -16,15 +16,21 @@
|
| 'variables': {
|
| 'test_files': [],
|
| 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/nacl_test_data/newlib',
|
| - 'out_newlib32': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32.nexe',
|
| - 'out_newlib64': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_64.nexe',
|
| - 'out_newlib_arm': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_arm.nexe',
|
| - 'nmf_newlib': '>(nacl_newlib_out_dir)/>(nexe_target).nmf',
|
| 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/nacl_test_data/glibc',
|
| - 'out_glibc32': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_32.nexe',
|
| - 'out_glibc64': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_64.nexe',
|
| - 'out_glibc_arm': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_arm.nexe',
|
| - 'nmf_glibc': '>(nacl_glibc_out_dir)/>(nexe_target).nmf',
|
| + 'target_conditions': [
|
| + ['nexe_target!=""', {
|
| + # These variables are used for nexe building and for library building,
|
| + # so they should be unconditionally re-defined.
|
| + 'out_newlib32': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32.nexe',
|
| + 'out_newlib64': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_64.nexe',
|
| + 'out_newlib_arm': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_arm.nexe',
|
| + 'nmf_newlib': '>(nacl_newlib_out_dir)/>(nexe_target).nmf',
|
| + 'out_glibc32': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_32.nexe',
|
| + 'out_glibc64': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_64.nexe',
|
| + 'out_glibc_arm': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_arm.nexe',
|
| + 'nmf_glibc': '>(nacl_glibc_out_dir)/>(nexe_target).nmf',
|
| + }],
|
| + ],
|
| },
|
| 'dependencies': [
|
| '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
|
|
|