diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 21:54:38 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 21:54:38 +0000 |
| commit | 117a20c5672302f4d17f3814fe7312b5d7b7616c (patch) | |
| tree | c632fb85b542f87ac417537b35f05dbc89cf4e96 | |
| parent | 20ed98937f306d3df44e8953875abe1ce8d4d6dd (diff) | |
| download | chromium_src-117a20c5672302f4d17f3814fe7312b5d7b7616c.zip chromium_src-117a20c5672302f4d17f3814fe7312b5d7b7616c.tar.gz chromium_src-117a20c5672302f4d17f3814fe7312b5d7b7616c.tar.bz2 | |
[NaCl SDK] AppEngine: fix smoothlife build.
Also turn off naclports annotation when building AppEngine examples.
BUG=none
TBR=sbc@chromium.org
Review URL: https://codereview.chromium.org/66823003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234010 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 1 | ||||
| -rwxr-xr-x | native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 73226b76..04ef246 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -865,6 +865,7 @@ def BuildStepBuildAppEngine(pepperdir, chrome_revision): cmd = ['make', 'upload', 'REVISION=%s' % chrome_revision] env = dict(os.environ) env['NACL_SDK_ROOT'] = pepperdir + env['NACLPORTS_NO_ANNOTATE'] = "1" buildbot_common.Run(cmd, env=env, cwd=GONACL_APPENGINE_SRC_DIR) diff --git a/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh b/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh index a4d8571..6fd7b8f 100755 --- a/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh +++ b/native_client_sdk/src/gonacl_appengine/src/smoothlife/build.sh @@ -71,7 +71,7 @@ Banner Updating submodules LogExecute git submodule update --init Banner Building FFTW -LogExecute make ports +LogExecute make ports TOOLCHAIN=pnacl CONFIG=Release Banner Building smoothlife LogExecute make TOOLCHAIN=pnacl CONFIG=Release -j${OS_JOBS} |