diff options
| author | jgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 01:20:12 +0000 |
|---|---|---|
| committer | jgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 01:20:12 +0000 |
| commit | e1637a5cc07efc57db84427beef0be8807d7726b (patch) | |
| tree | db9cd2f668e7015ded147d9ba54bdd25ffc33874 | |
| parent | a853a6445d6d9ac7d2ccd942de649423968eaeb4 (diff) | |
| download | chromium_src-e1637a5cc07efc57db84427beef0be8807d7726b.zip chromium_src-e1637a5cc07efc57db84427beef0be8807d7726b.tar.gz chromium_src-e1637a5cc07efc57db84427beef0be8807d7726b.tar.bz2 | |
Filter out devtools_window.cc from Chrome on Android build
This eliminates some link errors when trying to remove browser.cc from the build.
BUG=117407
TEST=
Review URL: http://codereview.chromium.org/9546036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131061 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index faeb162..7f95ebd 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -185,7 +185,6 @@ void RegisterUserPrefs(PrefService* user_prefs) { ChromeVersionService::RegisterUserPrefs(user_prefs); chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); - DevToolsWindow::RegisterUserPrefs(user_prefs); DownloadPrefs::RegisterUserPrefs(user_prefs); extensions::ComponentLoader::RegisterUserPrefs(user_prefs); ExtensionPrefs::RegisterUserPrefs(user_prefs); @@ -228,6 +227,7 @@ void RegisterUserPrefs(PrefService* user_prefs) { #if !defined(OS_ANDROID) Browser::RegisterUserPrefs(user_prefs); BrowserInit::RegisterUserPrefs(user_prefs); + DevToolsWindow::RegisterUserPrefs(user_prefs); PinnedTabCodec::RegisterUserPrefs(user_prefs); PluginsUI::RegisterUserPrefs(user_prefs); PromoResourceService::RegisterUserPrefs(user_prefs); diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 8d8ae45..05bdbb2 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -214,6 +214,11 @@ '../build/linux/system.gyp:gtk', ], }], + ['OS=="android"', { + 'sources!': [ + 'browser/debugger/devtools_window.cc', + ], + }], ], }, { |