diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 11:27:53 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 11:27:53 +0000 |
| commit | 604b12798766aedfca9209e2b3ab1b38f520f824 (patch) | |
| tree | f49d4e6746e7c11eca40605a4639016dbc3bc134 /content | |
| parent | 0b445483ca5fe3d6522bc2e1e3f744b4ff2c0e91 (diff) | |
| download | chromium_src-604b12798766aedfca9209e2b3ab1b38f520f824.zip chromium_src-604b12798766aedfca9209e2b3ab1b38f520f824.tar.gz chromium_src-604b12798766aedfca9209e2b3ab1b38f520f824.tar.bz2 | |
Scrub ozone files from linux GN build
These files are removed from the GYP build with pattern-based
exclusions, so we need to remove them from targets populated from
gypi_to_gn.py.
BUG=396370
TEST=gn gen out_gn_linux; ninja -C out_gn_linux all
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/412053002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/BUILD.gn | 16 | ||||
| -rw-r--r-- | content/common/BUILD.gn | 1 |
2 files changed, 16 insertions, 1 deletions
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index 97a6dd4..8652983 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -324,12 +324,17 @@ source_set("browser") { sources -= [ "battery_status/battery_status_manager_default.cc", "geolocation/wifi_data_provider_linux.cc", - "power_save_blocker_ozone.cc", "power_save_blocker_x11.cc", ] deps += [ "//chromeos:power_manager_proto" ] } + if (!use_ozone || is_chromeos) { + sources -= [ + "power_save_blocker_ozone.cc", + ] + } + if (use_aura) { deps += [ "//ui/aura", @@ -376,6 +381,15 @@ source_set("browser") { deps += [ "//ui/compositor" ] } + if (!use_ozone) { + sources -= [ + "compositor/overlay_candidate_validator_ozone.cc", + "compositor/overlay_candidate_validator_ozone.h", + "compositor/software_output_device_ozone.cc", + "compositor/software_output_device_ozone.h", + ] + } + if (enable_web_speech) { deps += [ "//third_party/flac", diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 66d78a6..af0334b 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -124,6 +124,7 @@ source_set("common") { sources -= [ "cursors/webcursor_ozone.cc", "font_list_ozone.cc", + "gpu/gpu_memory_buffer_factory_ozone.cc", ] } |