Skip to content

Commit

Permalink
Remove redundant newlib builds of untrusted libraries
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dschuff@chromium.org committed Aug 22, 2013
1 parent a510d40 commit b52fa34
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion components/tracing_untrusted.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down
2 changes: 1 addition & 1 deletion gpu/command_buffer/command_buffer_untrusted.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down
10 changes: 5 additions & 5 deletions gpu/gpu_untrusted.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand All @@ -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': [
Expand All @@ -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': [
Expand All @@ -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': [
Expand All @@ -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': [
Expand Down
2 changes: 1 addition & 1 deletion ipc/ipc_untrusted.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down
2 changes: 1 addition & 1 deletion media/media_untrusted.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down
2 changes: 1 addition & 1 deletion ppapi/ppapi_ipc_untrusted.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down
2 changes: 1 addition & 1 deletion ppapi/ppapi_proxy_untrusted.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down
2 changes: 1 addition & 1 deletion ppapi/ppapi_shared_untrusted.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down

0 comments on commit b52fa34

Please sign in to comment.