diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 01:33:39 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 01:33:39 +0000 |
| commit | ea43be44f89e4c0d1b3d6a74c0ac2a9145ee8c92 (patch) | |
| tree | 456934297cabfd8dd45c6174b6f21f276a1b4493 /ppapi/ppapi_nacl_test_common.gypi | |
| parent | 20d30c3f9259fee607b8b4688c6b10731386a848 (diff) | |
| download | chromium_src-ea43be44f89e4c0d1b3d6a74c0ac2a9145ee8c92.zip chromium_src-ea43be44f89e4c0d1b3d6a74c0ac2a9145ee8c92.tar.gz chromium_src-ea43be44f89e4c0d1b3d6a74c0ac2a9145ee8c92.tar.bz2 | |
Add dependency on create_nmf.py to all ppapi NaCl tests.
BUG=328980
R=dmichael@chromium.org
Review URL: https://codereview.chromium.org/113133008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_nacl_test_common.gypi')
| -rw-r--r-- | ppapi/ppapi_nacl_test_common.gypi | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi index dd1adb1..99599ef 100644 --- a/ppapi/ppapi_nacl_test_common.gypi +++ b/ppapi/ppapi_nacl_test_common.gypi @@ -89,22 +89,17 @@ 'extra_args': [ '--strip-all', ], + 'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', }, 'target_conditions': [ ['generate_nmf==1 and build_newlib==1', { 'actions': [ { 'action_name': 'Generate NEWLIB NMF', - # Unlike glibc, nexes are not actually inputs - only the names matter. - # We don't have the nexes as inputs because the ARM nexe may not - # exist. However, VS 2010 seems to blackhole this entire target if - # there are no inputs to this action. To work around this we add a - # bogus input. - 'inputs': [], + 'inputs': ['>(create_nmf)'], 'outputs': ['>(nmf_newlib)'], 'action': [ 'python', - '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', '>@(_inputs)', '--output=>(nmf_newlib)', ], @@ -133,14 +128,13 @@ 'actions': [ { 'action_name': 'Generate GLIBC NMF and copy libs', - 'inputs': [], + 'inputs': ['>(create_nmf)'], # NOTE: There is no explicit dependency for the lib32 # and lib64 directories created in the PRODUCT_DIR. # They are created as a side-effect of NMF creation. 'outputs': ['>(nmf_glibc)'], 'action': [ 'python', - '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', '>@(_inputs)', '--objdump=>(nacl_objdump)', '--output=>(nmf_glibc)', @@ -171,11 +165,12 @@ 'actions': [ { 'action_name': 'Generate PNACL NEWLIB NMF', - 'inputs': ['>(out_pnacl_newlib)'], + # NOTE: create_nmf must be first, it is the script python + # executes below. + 'inputs': ['>(create_nmf)', '>(out_pnacl_newlib)'], 'outputs': ['>(nmf_pnacl_newlib)'], 'action': [ 'python', - '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', '>@(_inputs)', '--output=>(nmf_pnacl_newlib)', ], |