summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authornoelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-12 03:15:01 +0000
committernoelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-12 03:15:01 +0000
commitaeb8053ed3f1f7a21834628cbafdfdf5dba2fa68 (patch)
tree8aed13fe1f35da1740797671c5d76673457b1482 /ppapi
parentdf8bf739a77fe21e9e8623aab6d5451189399028 (diff)
downloadchromium_src-aeb8053ed3f1f7a21834628cbafdfdf5dba2fa68.zip
chromium_src-aeb8053ed3f1f7a21834628cbafdfdf5dba2fa68.tar.gz
chromium_src-aeb8053ed3f1f7a21834628cbafdfdf5dba2fa68.tar.bz2
Revert 109764 - Fix size regression due to missing strip.
Add a strip script based on the old build_nacl_irt.py (just keep strip piece) Rename nacl_irt target to nacl_irt_unstripped and add a new target called nacl_irt which strips the previous target. Review URL: http://codereview.chromium.org/8539039 TBR=noelallen@google.com Review URL: http://codereview.chromium.org/8538036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/native_client/native_client.gyp67
1 files changed, 3 insertions, 64 deletions
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index f5dad13..ab31742 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -32,12 +32,12 @@
],
},
{
- 'target_name': 'nacl_irt_unstripped',
+ 'target_name': 'nacl_irt',
'type': 'none',
'variables': {
'nexe_target': 'nacl_irt',
- 'out64': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_64.nexe',
- 'out32': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_32.nexe',
+ 'out64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+ 'out32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
'build_glibc': 0,
'build_newlib': 1,
'include_dirs': [
@@ -84,67 +84,6 @@
'../../native_client/src/shared/gio/gio.gyp:gio_lib',
],
},
- {
- 'target_name': 'nacl_irt',
- 'type': 'none',
- 'dependencies': [
- 'nacl_irt_unstripped',
- ],
- 'conditions': [
- ['target_arch=="ia32"', {
- 'actions': [
- {
- 'action_name': 'strip x86-32 irt',
- 'msvs_cygwin_shell': 0,
- 'description': 'Strip x86-32 nacl_irt)',
- 'inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_32.nexe',
- '../../chrome/strip_nacl_irt.py',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
- ],
- 'action': [
- '>(python_exe)',
- '../../chrome/strip_nacl_irt.py',
- '--platform',
- 'x86-32'
- '--src',
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_32.nexe',
- '--dst',
- '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe'
- ],
- },
- ],
- }],
- ['target_arch=="x64" or OS=="win"', {
- 'actions': [
- {
- 'action_name': 'strip x86-64 irt',
- 'msvs_cygwin_shell': 0,
- 'description': 'Strip x86-64 nacl_irt)',
- 'inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_64.nexe',
- '../../chrome/strip_nacl_irt.py',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
- ],
- 'action': [
- '>(python_exe)',
- '../../chrome/strip_nacl_irt.py',
- '--platform',
- 'x86-64',
- '--src',
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/nacl_irt_x86_64.nexe',
- '--dst',
- '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe'
- ],
- },
- ],
- }],
- ],
- },
],
}],
],