Revert 97056 - Gyp fix for release build.

chrome/nacl.gypi

Index: chrome/nacl.gypi
===================================================================
--- chrome/nacl.gypi	(revision 97057)
+++ chrome/nacl.gypi	(working copy)
@@ -144,12 +144,10 @@
         },
       ],
     }],
-    ['OS=="linux"', {
+    ['OS=="linux" and touchui == 0', {
       'targets': [
         {
-          'target_name': 'nacl_helper.so',
-          # 'executable' will be overridden below when we add the -shared
-          # flag; here it prevents gyp from using the --whole-archive flag
+          'target_name': 'nacl_helper',
           'type': 'executable',
           'include_dirs': [
             '..',
@@ -167,35 +165,7 @@
               ],
             }],
           ],
-          'link_settings': {
-            # NOTE: '-shared' overrides 'executable' above
-            'ldflags': ['-shared',
-                        '-Wl,--version-script=chrome/nacl/nacl_helper_exports.txt',
-                      ],
-          },
         },
-        {
-          'target_name': 'nacl_helper_bootstrap',
-          'type': 'executable',
-          'dependencies': [
-            'nacl_helper.so',
-          ],
-          'sources': [
-            '../chrome/nacl/nacl_helper_bootstrap_linux.c',
-          ],
-          # TODO(bradchen): Delete the -B argument when Gold supports
-          # -Ttext properly. Until then use ld.bfd.
-          'link_settings': {
-            'ldflags': ['-B', 'tools/ld_bfd',
-                        # Force text segment at 0x10000 (64KB)
-                        # The max-page-size option is needed on x86-64 linux
-                        # where 4K pages are not the default in the BFD linker.
-                        '-Wl,-Ttext-segment,10000,-z,max-page-size=0x1000',
-                        # reference nacl_helper as a shared library
-                        '<(PRODUCT_DIR)/nacl_helper.so',
-                      ],
-          },
-        },
       ],
     }],
   ],