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

Unified Diff: native_client_sdk/src/build_tools/build_artifacts.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: Created 6 years 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
Index: native_client_sdk/src/build_tools/build_artifacts.py
diff --git a/native_client_sdk/src/build_tools/build_artifacts.py b/native_client_sdk/src/build_tools/build_artifacts.py
index 1a9f0d8a6862cec6e85453b2b429db8c8898a8ea..d583bc78a3a16df47d258af066bd995986f11dfe 100755
--- a/native_client_sdk/src/build_tools/build_artifacts.py
+++ b/native_client_sdk/src/build_tools/build_artifacts.py
@@ -358,8 +358,17 @@ def GetGypToolchainLib(root, tcname, xarch):
def MakeGypArchives():
join = os.path.join
- gyp_nacl = join(NACL_DIR, 'build', 'gyp_nacl')
gyp_chromium = join(SRC_DIR, 'build', 'gyp_chromium')
+ # TODO(binji): gyp_nacl doesn't build properly on Windows anymore; it only
+ # can use VS2010, not VS2013 which is now required by the Chromium repo. NaCl
+ # needs to be updated to perform the same logic as Chromium in detecting VS,
+ # which can now exist in the depot_tools directory.
+ # See https://code.google.com/p/nativeclient/issues/detail?id=4022
+ #
+ # For now, let's use gyp_chromium to build these components.
+ # gyp_nacl = join(NACL_DIR, 'build', 'gyp_nacl')
bradn 2014/12/15 23:10:06 leave this in?
+ gyp_nacl = gyp_chromium
Sam Clegg 2014/12/15 23:17:41 Does this slow down the build at all?
binji 2014/12/16 01:08:32 Doesn't seem to.
+
nacl_core_sdk_gyp = join(NACL_DIR, 'build', 'nacl_core_sdk.gyp')
all_gyp = join(NACL_DIR, 'build', 'all.gyp')
breakpad_gyp = join(SRC_DIR, 'breakpad', 'breakpad.gyp')
« no previous file with comments | « no previous file | native_client_sdk/src/build_tools/build_sdk.py » ('j') | native_client_sdk/src/build_tools/build_sdk.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698