summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-19 23:04:54 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-19 23:06:34 +0000
commiteae20a21614fcab225c103c518faa16ef3aebec3 (patch)
tree02ef955a223a37aaac89e00f9a5a4c3c0125233e
parentb62a17d9fb288537a9fd70eb44e562acd5c06728 (diff)
downloadchromium_src-eae20a21614fcab225c103c518faa16ef3aebec3.zip
chromium_src-eae20a21614fcab225c103c518faa16ef3aebec3.tar.gz
chromium_src-eae20a21614fcab225c103c518faa16ef3aebec3.tar.bz2
GN: Remove duplicate entries from sources lists
R=brettw@chromium.org Review URL: https://codereview.chromium.org/465693002 Cr-Commit-Position: refs/heads/master@{#290688} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290688 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_browser_extensions.gypi2
-rw-r--r--chrome/chrome_browser_ui.gypi1
-rw-r--r--content/content_browser.gypi1
-rw-r--r--gpu/command_buffer/common/BUILD.gn1
-rw-r--r--printing/BUILD.gn6
-rw-r--r--sync/BUILD.gn1
-rw-r--r--ui/base/BUILD.gn1
-rw-r--r--ui/wm/BUILD.gn1
8 files changed, 3 insertions, 11 deletions
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index bb0aa0d..3682784 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -920,11 +920,9 @@
'chrome_browser_extensions_networking_private_sources': [
'browser/extensions/api/networking_private/crypto_verify_impl.cc',
'browser/extensions/api/networking_private/crypto_verify_impl.h',
- 'browser/extensions/api/networking_private/networking_private_api.h',
'browser/extensions/api/networking_private/networking_private_credentials_getter.h',
'browser/extensions/api/networking_private/networking_private_credentials_getter_mac.cc',
'browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc',
- 'browser/extensions/api/networking_private/networking_private_event_router.h',
'browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc',
'browser/extensions/api/networking_private/networking_private_service_client.cc',
'browser/extensions/api/networking_private/networking_private_service_client.h',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 9b7b3a1..02ffe92 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -353,7 +353,6 @@
'browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h',
'browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.mm',
'browser/ui/cocoa/constrained_window/constrained_window_custom_window.h',
- 'browser/ui/cocoa/constrained_window/constrained_window_custom_window.h',
'browser/ui/cocoa/constrained_window/constrained_window_custom_window.mm',
'browser/ui/cocoa/constrained_window/constrained_window_mac.h',
'browser/ui/cocoa/constrained_window/constrained_window_mac.mm',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 9b242f3..9404a8f 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1055,7 +1055,6 @@
'browser/renderer_host/render_process_host_impl.h',
'browser/renderer_host/render_sandbox_host_linux.cc',
'browser/renderer_host/render_sandbox_host_linux.h',
- 'browser/renderer_host/render_process_host_impl.h',
'browser/renderer_host/render_view_host_delegate.cc',
'browser/renderer_host/render_view_host_delegate.h',
'browser/renderer_host/render_view_host_delegate_view.h',
diff --git a/gpu/command_buffer/common/BUILD.gn b/gpu/command_buffer/common/BUILD.gn
index a60626e..ad6d320 100644
--- a/gpu/command_buffer/common/BUILD.gn
+++ b/gpu/command_buffer/common/BUILD.gn
@@ -17,7 +17,6 @@ source_set("common") {
"debug_marker_manager.h",
"gles2_cmd_format.cc",
"gles2_cmd_format.h",
- "gles2_cmd_format.h",
"gles2_cmd_format_autogen.h",
"gles2_cmd_ids.h",
"gles2_cmd_ids_autogen.h",
diff --git a/printing/BUILD.gn b/printing/BUILD.gn
index 0f7f564..0c88889 100644
--- a/printing/BUILD.gn
+++ b/printing/BUILD.gn
@@ -125,12 +125,12 @@ component("printing") {
}
if (use_cups) {
- cups_version = exec_script("cups_config_helper.py", [ "--api-version" ],
- "trim string")
-
configs += [ ":cups" ]
if (is_linux) {
+ cups_version = exec_script("cups_config_helper.py", [ "--api-version" ],
+ "trim string")
+
if (cups_version == "1.6" || cups_version == "1.7") {
cflags += [
# CUPS 1.6 deprecated the PPD APIs, but we will stay with this
diff --git a/sync/BUILD.gn b/sync/BUILD.gn
index e3e8914..e25d63b 100644
--- a/sync/BUILD.gn
+++ b/sync/BUILD.gn
@@ -170,7 +170,6 @@ source_set("sync_core") {
"internal_api/public/base/cancelation_signal.cc",
"internal_api/public/base/cancelation_signal.h",
"internal_api/public/base/enum_set.h",
- "internal_api/public/base/enum_set.h",
"internal_api/public/base/invalidation_interface.cc",
"internal_api/public/base/invalidation_interface.h",
"internal_api/public/base/model_type.h",
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index cd68336..8599c96 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -217,7 +217,6 @@ component("base") {
"ui_base_switches_util.h",
"ui_base_types.cc",
"ui_base_types.h",
- "ui_base_export.h",
"view_prop.cc",
"view_prop.h",
"webui/jstemplate_builder.cc",
diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn
index 30b1c2e..c16a833 100644
--- a/ui/wm/BUILD.gn
+++ b/ui/wm/BUILD.gn
@@ -7,7 +7,6 @@ component("wm") {
"core/accelerator_delegate.h",
"core/accelerator_filter.cc",
"core/accelerator_filter.h",
- "core/base_focus_rules.h",
"core/base_focus_rules.cc",
"core/base_focus_rules.h",
"core/capture_controller.cc",