Revert 27324 - First step towards NaClChrome integration:1. NaCl plugin becom...

chrome/chrome.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
@@ skipping 90 matching lines @@
       '../views/view_unittest.cc',
       '../views/focus/focus_manager_unittest.cc',
       '../views/controls/label_unittest.cc',
     ],
     'views_unit_tests_sources_win_specific': [
       # TODO(jcampan): make the following tests work on Linux.
       '../views/controls/table/table_view_unittest.cc',
       '../views/grid_layout_unittest.cc',
     ],
     'conditions': [
-      ['OS=="win"', {
-        'nacl_defines': [
-          'NACL_WINDOWS=1',
-          'NACL_LINUX=0',
-          'NACL_OSX=0',
-        ],
-      },],
-      ['OS=="linux"', {
-        'nacl_defines': [
-          'NACL_WINDOWS=0',
-          'NACL_LINUX=1',
-          'NACL_OSX=0',
-        ],
-      },],
       ['OS=="mac"', {
-        'nacl_defines': [
-          'NACL_WINDOWS=0',
-          'NACL_LINUX=0',
-          'NACL_OSX=1',
-        ],
         'conditions': [
           ['branding=="Chrome"', {
             'mac_bundle_id': 'com.google.Chrome',
             'mac_creator': 'rimZ',
           }, {  # else: branding!="Chrome"
             'mac_bundle_id': 'org.chromium.Chromium',
             'mac_creator': 'Cr24',
           }],  # branding
         ],  # conditions
       }],  # OS=="mac"
       ['OS=="win"', {
         # Whether or not browser sync code is built in.
         'chrome_personalization%': 1,
         # Used to build a stub (no-op) syncapi engine.
         'use_syncapi_stub%': 0,
       }, {
         'chrome_personalization%': 0,
         'use_syncapi_stub%': 1,
       }],  # OS=="win"
-      ['target_arch=="ia32"', {
-        'nacl_defines': [
-          # TODO(gregoryd): consider getting this from NaCl's common.gypi
-          'NACL_TARGET_SUBARCH=32',
-          'NACL_BUILD_SUBARCH=32',
-        ],
-      }],
-      ['target_arch=="x64"', {
-        'nacl_defines': [
-          # TODO(gregoryd): consider getting this from NaCl's common.gypi
-          'NACL_TARGET_SUBARCH=64',
-          'NACL_BUILD_SUBARCH=64',
-        ],
-      }],
     ],  # conditions
   },  # variables
   'target_defaults': {
     'sources/': [
       ['exclude', '/(cocoa|gtk|win)/'],
       ['exclude', '_(cocoa|gtk|linux|mac|posix|skia|win|views|x)(_unittest)?\\.(cc|mm?)$'],
       ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
     ],
     'conditions': [
       ['OS=="linux" or OS=="freebsd"', {'sources/': [
@@ skipping 442 matching lines @@
         'common/render_messages.h',
         'common/render_messages_internal.h',
         'common/renderer_preferences.h',
         'common/resource_dispatcher.cc',
         'common/resource_dispatcher.h',
         'common/result_codes.h',
         'common/sandbox_init_wrapper.cc',
         'common/sandbox_init_wrapper.h',
         'common/security_filter_peer.cc',
         'common/security_filter_peer.h',
-        'common/nacl_messages.h',
-        'common/nacl_messages_internal.h',
         'common/sqlite_compiled_statement.cc',
         'common/sqlite_compiled_statement.h',
         'common/sqlite_utils.cc',
         'common/sqlite_utils.h',
         'common/task_queue.cc',
         'common/task_queue.h',
         'common/temp_scaffolding_stubs.cc',
         'common/temp_scaffolding_stubs.h',
         'common/thumbnail_score.cc',
         'common/thumbnail_score.h',
@@ skipping 94 matching lines @@
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/hunspell/hunspell.gyp:hunspell',
         '../webkit/webkit.gyp:database',
         '../webkit/webkit.gyp:glue',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
       ],
-      'defines': [
-        '<@(nacl_defines)',
-      ],
       'sources': [
         # All .cc, .h, .m, and .mm files under browser except for tests and
         # mocks.
         'browser/alternate_nav_url_fetcher.cc',
         'browser/alternate_nav_url_fetcher.h',
         'browser/app_controller_mac.h',
         'browser/app_controller_mac.mm',
         'browser/app_modal_dialog.cc',
         'browser/app_modal_dialog.h',
         'browser/app_modal_dialog_gtk.cc',
@@ skipping 1106 matching lines @@
         'browser/search_engines/template_url_fetcher.cc',
         'browser/search_engines/template_url_fetcher.h',
         'browser/search_engines/template_url_model.cc',
         'browser/search_engines/template_url_model.h',
         'browser/search_engines/template_url_parser.cc',
         'browser/search_engines/template_url_parser.h',
         'browser/search_engines/template_url_prepopulate_data.cc',
         'browser/search_engines/template_url_prepopulate_data.h',
         'browser/search_engines/template_url_table_model.cc',
         'browser/search_engines/template_url_table_model.h',
-        'browser/nacl_process_host.cc',
-        'browser/nacl_process_host.h',
         'browser/session_startup_pref.cc',
         'browser/session_startup_pref.h',
         'browser/sessions/base_session_service.cc',
         'browser/sessions/base_session_service.h',
         'browser/sessions/session_backend.cc',
         'browser/sessions/session_backend.h',
         'browser/sessions/session_command.cc',
         'browser/sessions/session_command.h',
         'browser/sessions/session_id.cc',
         'browser/sessions/session_id.h',
@@ skipping 1022 matching lines @@
             '_CRT_SECURE_NO_DEPRECATE',
             '_SCL_SECURE_NO_DEPRECATE',
           ],
           'include_dirs': [
             'third_party/wtl/include',
           ],
         },],
       ],
     },
     {
-      'target_name': 'nacl',
-      'type': '<(library)',
-      'msvs_guid': '83E86DAF-5763-4711-AD34-5FDAE395560C',
-      'dependencies': [
-        'common',
-        'chrome_resources',
-        'chrome_strings',
-        '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/webkit.gyp:glue',
-        '../native_client/src/trusted/plugin/plugin_chrome.gyp:npGoogleNaClPluginChrome',
-        '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
-        '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate',
-        '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
-      ],
-      'include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-      ],
-      'defines': [
-        'NACL_BLOCK_SHIFT=5',
-        'NACL_BLOCK_SIZE=32',
-        '<@(nacl_defines)',
-      ],
-      'sources': [
-        # All .cc, .h, .m, and .mm files under nacl except for tests and
-        # mocks.
-        'nacl/sel_main.cc',
-        'nacl/nacl_main.cc',
-        'nacl/nacl_thread.cc',
-        'nacl/nacl_thread.h',
-      ],
-      # TODO(gregoryd): consider switching NaCl to use Chrome OS defines
-      'conditions': [
-        ['OS=="win"', {
-          'defines': [
-            '__STD_C',
-            '_CRT_SECURE_NO_DEPRECATE',
-            '_SCL_SECURE_NO_DEPRECATE',
-          ],
-          'include_dirs': [
-            'third_party/wtl/include',
-          ],
-        },],
-      ],
-    },
-    {
       'target_name': 'renderer',
       'type': '<(library)',
       'msvs_guid': '9301A569-5D2B-4D11-9332-B1E30AEACB8D',
       'dependencies': [
         'common',
-        'nacl',
         'plugin',
         'chrome_resources',
         'chrome_strings',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
         '../webkit/webkit.gyp:glue',
         '../webkit/webkit.gyp:webkit',
       ],
       'include_dirs': [
         '..',
       ],
-      'defines': [
-        '<@(nacl_defines)',
-      ],
       'sources': [
         # TODO(jrg): to link ipc_tests, these files need to be in renderer.a.
         # But app/ is the wrong directory for them.
         # Better is to remove the dep of *_tests on renderer, but in the
         # short term I'd like the build to work.
         'renderer/automation/dom_automation_controller.cc',
         'renderer/automation/dom_automation_controller.h',
         'renderer/extensions/bindings_utils.cc',
         'renderer/extensions/bindings_utils.h',
         'renderer/extensions/event_bindings.cc',
@@ skipping 457 matching lines @@
             'CHROMIUM_SHORT_NAME': '<(branding)',
           },
           'mac_bundle_resources': [
             '<(PRODUCT_DIR)/<(mac_product_name) Helper.app',
           ],
           'dependencies': [
             'helper_app',
             'infoplist_strings_tool',
             # Bring in pdfsqueeze and run it on all pdfs
             '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze',
-            # This library provides the real implementation for NaClSyscallSeg
-            '../native_client/src/trusted/service_runtime/arch/x86_32/service_runtime_x86_32.gyp:service_runtime_x86_32_chrome'
           ],
           'rules': [
             {
               'rule_name': 'pdfsqueeze',
               'extension': 'pdf',
               'inputs': [
                 '<(PRODUCT_DIR)/pdfsqueeze',
               ],
               'outputs': [
                 '<(INTERMEDIATE_DIR)/pdfsqueeze/<(RULE_INPUT_ROOT).pdf',
@@ skipping 3285 matching lines @@
               'defines': [
                 'POSIX',
               ],
             }],
           ],
         },
       ],  # targets when chrome_personalization==1 and use_syncapi_stub==0
     }],
   ],  # 'conditions'
 }