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

Unified Diff: native_client_sdk/src/build_tools/build_sdk.py

Issue 11882012: Convert all project to use common.mk (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 7 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
Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 94b632ee22ae07e4e8b001465433551a54a3f11b..abf8710c58cb50088804430579bf2e2dbc6e6651 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -586,6 +586,8 @@ def BuildStepCopyBuildHelpers(pepperdir, platform):
buildbot_common.BuildStep('Copy build helpers')
buildbot_common.CopyDir(os.path.join(SDK_SRC_DIR, 'tools', '*.py'),
os.path.join(pepperdir, 'tools'))
+ buildbot_common.CopyDir(os.path.join(SDK_SRC_DIR, 'tools', '*.mk'),
+ os.path.join(pepperdir, 'tools'))
if platform == 'win':
buildbot_common.BuildStep('Add MAKE')
http_download.HttpDownload(GSTORE + MAKE,
@@ -732,7 +734,8 @@ def GetWindowsEnvironment():
return dict(line.split('=') for line in stdout.split('\r\n')[:-1])
-def BuildStepMakeAll(pepperdir, platform, directory, step_name, clean=False):
+def BuildStepMakeAll(pepperdir, platform, directory, step_name,
+ clean=False, deps=True):
buildbot_common.BuildStep(step_name)
make_dir = os.path.join(pepperdir, directory)
makefile = os.path.join(make_dir, 'Makefile')
@@ -746,11 +749,15 @@ def BuildStepMakeAll(pepperdir, platform, directory, step_name, clean=False):
env = os.environ
make = 'make'
- buildbot_common.Run([make, '-j8'],
+ extra_args = []
+ if not deps:
+ extra_args += 'IGNORE_DEPS=1'
+
+ buildbot_common.Run([make, '-j8', 'all_versions'] + extra_args,
cwd=os.path.abspath(make_dir), env=env)
if clean:
# Clean to remove temporary files but keep the built libraries.
- buildbot_common.Run([make, '-j8', 'clean'],
+ buildbot_common.Run([make, '-j8', 'clean'] + extra_args,
cwd=os.path.abspath(make_dir))
« no previous file with comments | « native_client_sdk/src/build_tools/build_examples.py ('k') | native_client_sdk/src/build_tools/generate_make.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698