diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 18:31:10 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 18:31:10 +0000 |
| commit | a20d1fe55c3f3817a0c7eab05dd1d774af695e1f (patch) | |
| tree | 493cb35583b5c352b467049f9486f734ab55cea4 /ppapi | |
| parent | ec29ec03e6bfaee699e172e4cb6427758380bfe2 (diff) | |
| download | chromium_src-a20d1fe55c3f3817a0c7eab05dd1d774af695e1f.zip chromium_src-a20d1fe55c3f3817a0c7eab05dd1d774af695e1f.tar.gz chromium_src-a20d1fe55c3f3817a0c7eab05dd1d774af695e1f.tar.bz2 | |
Partial revert of 155693.
In change 155693 we pulled in a new pnacl toolchain that is 32-bit
(where the previous one was 64-bit).
The chromeos chroot does not have the 32-bit version of zlib.
This causes pnacl-ar to blow up.
Other changes to build gio_lib as a .so cause gio_lib.so to elide gio.a.
Preventing an incremental build after a full revert.
Doing a partial revert instead.
R=noelallen@chromium.org
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10911184
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/native_client.gyp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp index a4745f4..7ad7cac 100644 --- a/ppapi/native_client/native_client.gyp +++ b/ppapi/native_client/native_client.gyp @@ -20,20 +20,21 @@ '..', ], 'copies': [ - { - 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include/nacl', - 'files': [ - 'src/trusted/weak_ref/call_on_main_thread.h', - 'src/shared/ppapi_proxy/ppruntime.h', - ], - }, - { - 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/include/nacl', - 'files': [ - 'src/trusted/weak_ref/call_on_main_thread.h', - 'src/shared/ppapi_proxy/ppruntime.h', - ], - }, + # TODO(bradnelson): Re-enable on nacl DEPS roll. + #{ + # 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include/nacl', + # 'files': [ + # 'src/trusted/weak_ref/call_on_main_thread.h', + # 'src/shared/ppapi_proxy/ppruntime.h', + # ], + #}, + #{ + # 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/include/nacl', + # 'files': [ + # 'src/trusted/weak_ref/call_on_main_thread.h', + # 'src/shared/ppapi_proxy/ppruntime.h', + # ], + #}, # Here we copy linker scripts out of the Native Client repository. # These are source, not build artifacts. { |