diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 22:29:02 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 22:29:02 +0000 |
| commit | f8ac9201779081a0774af8c30809bda9e770013b (patch) | |
| tree | bb08783419ef53185ef133ddb23a82d215359a79 /ppapi | |
| parent | 59dc4a7caa3d4cc0b6f08532aa67e94fb1a9a435 (diff) | |
| download | chromium_src-f8ac9201779081a0774af8c30809bda9e770013b.zip chromium_src-f8ac9201779081a0774af8c30809bda9e770013b.tar.gz chromium_src-f8ac9201779081a0774af8c30809bda9e770013b.tar.bz2 | |
Revert 151581 - Eliminate the 'build_ppapi_ipc_proxy_untrusted' build flag for untrusted PPAPI proxy builds.
This CL removes our custom GYP flag and modifies the build so both the SRPC and IPC proxies are built side by side. In addition, NaClBrowser now checks the '--enable-nacl-ipc-proxy' flag to determine which IRT to load. The IPC proxy's name is of the form 'nacl_ipc_irt_*'.
BUG=116317
TEST=builds and runs NaCl apps with --enable-nacl-ipc-proxy
Review URL: https://chromiumcodereview.appspot.com/10836220
TBR=bbudge@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10825351
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/native_client.gyp | 22 | ||||
| -rw-r--r-- | ppapi/ppapi_proxy_untrusted.gyp (renamed from ppapi/ppapi_ipc_proxy_untrusted.gyp) | 0 |
2 files changed, 16 insertions, 6 deletions
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp index d0d02e7..36f2564 100644 --- a/ppapi/native_client/native_client.gyp +++ b/ppapi/native_client/native_client.gyp @@ -53,6 +53,12 @@ }, ], }, + ], + }], + # TODO(bbudge) Remove the build_ppapi_ipc_proxy_untrusted flag, factor out common + # properties from both IRT flavors, and build them side by side. + ['disable_nacl==0 and disable_nacl_untrusted==0 and build_ppapi_ipc_proxy_untrusted==0', { + 'targets': [ { 'target_name': 'nacl_irt', 'type': 'none', @@ -177,16 +183,20 @@ '../../native_client/src/shared/gio/gio.gyp:gio_lib', ], }, + ], + }], + ['disable_nacl==0 and disable_nacl_untrusted==0 and build_ppapi_ipc_proxy_untrusted==1', { + 'targets': [ { - 'target_name': 'nacl_ipc_irt', + 'target_name': 'nacl_irt', 'type': 'none', 'variables': { - 'nexe_target': 'nacl_ipc_irt', + 'nexe_target': 'nacl_irt', # These out_* fields override the default filenames, which # include a "_newlib" suffix. - 'out_newlib64': '<(PRODUCT_DIR)/nacl_ipc_irt_x86_64.nexe', - 'out_newlib32': '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe', - 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_ipc_irt_arm.nexe', + 'out_newlib64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', + 'out_newlib32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', + 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_irt_arm.nexe', 'build_glibc': 0, 'build_newlib': 1, 'include_dirs': [ @@ -365,7 +375,7 @@ ], }, 'dependencies': [ - '../ppapi_ipc_proxy_untrusted.gyp:ppapi_proxy_untrusted', + '../ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted', '../ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', '../../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted', '../../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', diff --git a/ppapi/ppapi_ipc_proxy_untrusted.gyp b/ppapi/ppapi_proxy_untrusted.gyp index baaa3cf..baaa3cf 100644 --- a/ppapi/ppapi_ipc_proxy_untrusted.gyp +++ b/ppapi/ppapi_proxy_untrusted.gyp |