diff options
author | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 22:09:12 +0000 |
---|---|---|
committer | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 22:09:12 +0000 |
commit | 18cd66f0a730b18840f9b9e96282c1308728c16e (patch) | |
tree | ea12085486034730beb8cdcf4e5cb31692c58d0f /chrome/app/dummy_main_functions.cc | |
parent | edc82b6482925ec2f276af8ee29a9ff903819d85 (diff) | |
download | chromium_src-18cd66f0a730b18840f9b9e96282c1308728c16e.zip chromium_src-18cd66f0a730b18840f9b9e96282c1308728c16e.tar.gz chromium_src-18cd66f0a730b18840f9b9e96282c1308728c16e.tar.bz2 |
Revert 34983 - Split more targets from chrome.gyp to add support for building Native Client for 64bit Windows.
This CL is required for supporting Native Client on 64bit Windows. On Win64 we will use a 64bit executable to load NaCl modules. Since we have only one version of Chrome on Windows, this executable has to be built together with 32bit Chrome binaries.
For the targets that are required for both 32bit and 64bit builds, this CL moves the shared parts of the target definitions into targetspecific gypi files (such as base.gypi). New 64bit only targets are added. Since we would like to port as few code as possible at this point, some 64bit targets include less source files or less dependencies than the original 32bit targets. These targets will have nacl_win64 in their name to emphasize that they should be used for NaCl only. Some 64bit targets are identical to the 32bit targets in everything except for the target platform these will have only win64 in their name.
TEST=none
BUG=28176
Review URL: http://codereview.chromium.org/384068
TBR=gregoryd@google.com
Review URL: http://codereview.chromium.org/501125
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34990 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/dummy_main_functions.cc')
-rw-r--r-- | chrome/app/dummy_main_functions.cc | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/chrome/app/dummy_main_functions.cc b/chrome/app/dummy_main_functions.cc deleted file mode 100644 index fa066ca..0000000 --- a/chrome/app/dummy_main_functions.cc +++ /dev/null @@ -1,44 +0,0 @@ -// 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. - -#include "chrome/common/main_function_params.h" -#include "chrome/common/result_codes.h" - -// Native Client binary for 64-bit Windows can run only the NaCl loader or -// the sandbox broker processes. Other process types are not supported. -int BrowserMain(const MainFunctionParams& parameters) { - return ResultCodes::BAD_PROCESS_TYPE; -} - -int RendererMain(const MainFunctionParams& parameters) { - return ResultCodes::BAD_PROCESS_TYPE; -} - -int PluginMain(const MainFunctionParams& parameters) { - return ResultCodes::BAD_PROCESS_TYPE; -} - -int WorkerMain(const MainFunctionParams& parameters) { - return ResultCodes::BAD_PROCESS_TYPE; -} - -int UtilityMain(const MainFunctionParams& parameters) { - return ResultCodes::BAD_PROCESS_TYPE; -} - -int ProfileImportMain(const MainFunctionParams& parameters) { - return ResultCodes::BAD_PROCESS_TYPE; -} - -int ZygoteMain(const MainFunctionParams& parameters) { - return ResultCodes::BAD_PROCESS_TYPE; -} - -int NaClBrokerMain(const MainFunctionParams& parameters) { - return ResultCodes::BAD_PROCESS_TYPE; -} - -int DiagnosticsMain(const CommandLine& command_line) { - return 1; -} |