diff options
| author | jvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 03:03:12 +0000 |
|---|---|---|
| committer | jvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 03:03:12 +0000 |
| commit | 4c94cae0a56e908274eff6fdfd0f1a16486f350b (patch) | |
| tree | a2fdfc527bfb31555de47c659cd49777f13d3c7d | |
| parent | 8ddc4fa7a499798ce390f9186209201d648c24bb (diff) | |
| download | chromium_src-4c94cae0a56e908274eff6fdfd0f1a16486f350b.zip chromium_src-4c94cae0a56e908274eff6fdfd0f1a16486f350b.tar.gz chromium_src-4c94cae0a56e908274eff6fdfd0f1a16486f350b.tar.bz2 | |
Prep change to use 'translate_pexe_with_build': 1 flag where needed.
Paired with: https://codereview.chromium.org/415653002/
Once that rolls into Chrome, it will require this flag
set in order to translate a pexe -> nexe.
This currently include ppapi_nacl test nexes, and a few
nonsfi x86-32 nexes.
Also adds a couple more shim deps for the nonsfi tests.
BUG=none
Review URL: https://codereview.chromium.org/413763002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286069 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/data/nacl/nacl_test_data.gyp | 3 | ||||
| -rw-r--r-- | ppapi/ppapi_nacl.gyp | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/chrome/test/data/nacl/nacl_test_data.gyp b/chrome/test/data/nacl/nacl_test_data.gyp index 677ca48..bcdf6c6 100644 --- a/chrome/test/data/nacl/nacl_test_data.gyp +++ b/chrome/test/data/nacl/nacl_test_data.gyp @@ -675,6 +675,7 @@ '<(DEPTH)/native_client/tools.gyp:prep_toolchain', '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', + '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot', '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib', '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', @@ -696,6 +697,7 @@ # We cannot disable building, as enable_XXX variables are also used # to build newlib linked nexes. 'build_pnacl_newlib': 1, + 'translate_pexe_with_build': 1, 'enable_x86_32_nonsfi': 1, }, }], @@ -741,6 +743,7 @@ # Enable nonsfi testing only on ia32-linux environment. 'variables': { 'enable_x86_32_nonsfi': 1, + 'translate_pexe_with_build': 1, }, }], ], diff --git a/ppapi/ppapi_nacl.gyp b/ppapi/ppapi_nacl.gyp index 8507719..8252f6d 100644 --- a/ppapi/ppapi_nacl.gyp +++ b/ppapi/ppapi_nacl.gyp @@ -183,6 +183,7 @@ ['disable_pnacl==0 and (target_arch=="ia32" or target_arch=="x64")', { 'variables': { 'build_pnacl_newlib': 1, + 'translate_pexe_with_build': 1, 'nmf_pnacl%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl.nmf', }, # Shim is a dependency for the nexe because we pre-translate. @@ -213,8 +214,13 @@ # by translating from .pexe binary, for non-SFI mode PPAPI testing. 'variables': { 'enable_x86_32_nonsfi': 1, + 'translate_pexe_with_build': 1, 'nmf_nonsfi%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_nonsfi.nmf', }, + # Shim is a dependency for the nexe because we pre-translate. + 'dependencies': [ + '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot', + ], 'actions': [ { 'action_name': 'Generate PNACL NEWLIB NONSFI NMF', @@ -232,6 +238,7 @@ ['disable_pnacl==0 and target_arch=="arm"', { 'variables': { 'build_pnacl_newlib': 1, + 'translate_pexe_with_build': 1, 'nmf_pnacl%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl.nmf', }, # Shim is a dependency for the nexe because we pre-translate. @@ -256,6 +263,7 @@ ['disable_pnacl==0 and target_arch=="mipsel"', { 'variables': { 'build_pnacl_newlib': 1, + 'translate_pexe_with_build': 1, 'nmf_pnacl%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl.nmf', }, # Shim is a dependency for the nexe because we pre-translate. |