diff options
| author | dschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 23:28:10 +0000 |
|---|---|---|
| committer | dschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 23:28:10 +0000 |
| commit | b52fa34850f93470a3e7ba06d50fd968d7dc0363 (patch) | |
| tree | 94cc79b810955073e10338a62ace1f699e39f557 | |
| parent | a510d40d7bbad7debdd2d1d3f0cc50eb038ae530 (diff) | |
| download | chromium_src-b52fa34850f93470a3e7ba06d50fd968d7dc0363.zip chromium_src-b52fa34850f93470a3e7ba06d50fd968d7dc0363.tar.gz chromium_src-b52fa34850f93470a3e7ba06d50fd968d7dc0363.tar.bz2 | |
Remove redundant newlib builds of untrusted libraries
Recent gyp changes (see the bug) split the IRT build rules off from the
newlib and glibc build. For libraries which go into the IRT, the
build_irt variable should be set (but not necessarily build_newlib).
For libraries that go into the NaCl SDK and/or testing nexes,
build_newlib, build_glibc and build_pnacl_newlib should be used.
These libraries modified in this CL go only into the NaCl IRT, so they
only need to build with build_irt.
R=bradnelson@chromium.org,dmichael@chromium.org,bbudge@chromium.org
TBR=brettw@chromium.org,fischman@chromium.org,jbauman@chromium.org
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3577
BUG= https://code.google.com/p/chromium/issues/detail?id=277813
Review URL: https://chromiumcodereview.appspot.com/22296003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219142 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | components/tracing_untrusted.gyp | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/command_buffer_untrusted.gyp | 2 | ||||
| -rw-r--r-- | gpu/gpu_untrusted.gyp | 10 | ||||
| -rw-r--r-- | ipc/ipc_untrusted.gyp | 2 | ||||
| -rw-r--r-- | media/media_untrusted.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_ipc_untrusted.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_proxy_untrusted.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_shared_untrusted.gyp | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/components/tracing_untrusted.gyp b/components/tracing_untrusted.gyp index f2215de..1991ec2 100644 --- a/components/tracing_untrusted.gyp +++ b/components/tracing_untrusted.gyp @@ -26,7 +26,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libtracing_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'sources': [ diff --git a/gpu/command_buffer/command_buffer_untrusted.gyp b/gpu/command_buffer/command_buffer_untrusted.gyp index 8f27a0b..0667fd8 100644 --- a/gpu/command_buffer/command_buffer_untrusted.gyp +++ b/gpu/command_buffer/command_buffer_untrusted.gyp @@ -21,7 +21,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libgles2_utils_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'dependencies': [ diff --git a/gpu/gpu_untrusted.gyp b/gpu/gpu_untrusted.gyp index a1f755c..7974d12 100644 --- a/gpu/gpu_untrusted.gyp +++ b/gpu/gpu_untrusted.gyp @@ -22,7 +22,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libgles2_implementation_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'defines': [ @@ -46,7 +46,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libcommand_buffer_common_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'includes': [ @@ -65,7 +65,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libgles2_cmd_helper_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'includes': [ @@ -84,7 +84,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libcommand_buffer_client_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'includes': [ @@ -103,7 +103,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libgpu_ipc_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'includes': [ diff --git a/ipc/ipc_untrusted.gyp b/ipc/ipc_untrusted.gyp index a502548..7b0c5483 100644 --- a/ipc/ipc_untrusted.gyp +++ b/ipc/ipc_untrusted.gyp @@ -21,7 +21,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libipc_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'dependencies': [ diff --git a/media/media_untrusted.gyp b/media/media_untrusted.gyp index dade625..638d401 100644 --- a/media/media_untrusted.gyp +++ b/media/media_untrusted.gyp @@ -19,7 +19,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libshared_memory_support_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'dependencies': [ diff --git a/ppapi/ppapi_ipc_untrusted.gyp b/ppapi/ppapi_ipc_untrusted.gyp index 9b0b678..9e13867 100644 --- a/ppapi/ppapi_ipc_untrusted.gyp +++ b/ppapi/ppapi_ipc_untrusted.gyp @@ -22,7 +22,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libppapi_ipc_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'include_dirs': [ diff --git a/ppapi/ppapi_proxy_untrusted.gyp b/ppapi/ppapi_proxy_untrusted.gyp index 727fbb5..35dff87 100644 --- a/ppapi/ppapi_proxy_untrusted.gyp +++ b/ppapi/ppapi_proxy_untrusted.gyp @@ -21,7 +21,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libppapi_proxy_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'include_dirs': [ diff --git a/ppapi/ppapi_shared_untrusted.gyp b/ppapi/ppapi_shared_untrusted.gyp index 4043c3a..453e711 100644 --- a/ppapi/ppapi_shared_untrusted.gyp +++ b/ppapi/ppapi_shared_untrusted.gyp @@ -22,7 +22,7 @@ 'nacl_untrusted_build': 1, 'nlib_target': 'libppapi_shared_untrusted.a', 'build_glibc': 0, - 'build_newlib': 1, + 'build_newlib': 0, 'build_irt': 1, }, 'include_dirs': [ |