Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Unified Diff: native_client_sdk/src/build_tools/tests/build_artifacts_test.py

Issue 811533002: [NaCl SDK] Update Windows build to use vs2013 from depot_tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge master Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « native_client_sdk/src/build_tools/buildbot_common.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/build_tools/tests/build_artifacts_test.py
diff --git a/native_client_sdk/src/build_tools/tests/build_artifacts_test.py b/native_client_sdk/src/build_tools/tests/build_artifacts_test.py
index 9c4f7564aac3a4bc1d40ec1dd73b61bfd8b13669..6bc938aa49436846a89d147f73b981e4d249fd29 100755
--- a/native_client_sdk/src/build_tools/tests/build_artifacts_test.py
+++ b/native_client_sdk/src/build_tools/tests/build_artifacts_test.py
@@ -181,15 +181,9 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
'output_dir=out_dir'],
cwd='src_dir',
env={
+ 'GYP_CROSSCOMPILE': '1',
'GYP_GENERATORS': 'ninja',
- 'GYP_DEFINES': 'target_arch=arm armv7=1 arm_thumb=0 arm_neon=1'
- ' arm_float_abi=hard nacl_enable_arm_gcc=1',
- 'CC': 'arm-linux-gnueabihf-gcc',
- 'CXX': 'arm-linux-gnueabihf-g++',
- 'AR': 'arm-linux-gnueabihf-ar',
- 'AS': 'arm-linux-gnueabihf-as',
- 'CC_host': 'cc',
- 'CXX_host': 'c++',
+ 'GYP_DEFINES': 'target_arch=arm arm_float_abi=hard',
}),
call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
])
@@ -204,16 +198,10 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
'output_dir=out_dir'],
cwd='src_dir',
env={
+ 'GYP_CROSSCOMPILE': '1',
'GYP_GENERATORS': 'ninja',
- 'GYP_DEFINES': 'target_arch=arm armv7=1 arm_thumb=0 arm_neon=1'
- ' arm_float_abi=hard nacl_enable_arm_gcc=1'
- ' disable_cross_trusted=1',
- 'CC': 'arm-linux-gnueabihf-gcc',
- 'CXX': 'arm-linux-gnueabihf-g++',
- 'AR': 'arm-linux-gnueabihf-ar',
- 'AS': 'arm-linux-gnueabihf-as',
- 'CC_host': 'cc',
- 'CXX_host': 'c++',
+ 'GYP_DEFINES': 'target_arch=arm arm_float_abi=hard '
+ 'disable_cross_trusted=1',
}),
call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
])
« no previous file with comments | « native_client_sdk/src/build_tools/buildbot_common.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698