Commit fdc8dcc2 authored by jiangj@opera.com's avatar jiangj@opera.com

Avoid merging chrome_browser_desktop_linux_sources lists

chrome_browser_desktop_linux_sources variable is defined in both
chrome_browser.gypi and chrome_browser_ui.gypi. If we keep the same
name the lists will be merged in gyp builds, resulting the same list
compiling twice for both browser and browser_ui targets.

Review URL: https://codereview.chromium.org/403503003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284044 0039d316-1c4b-4281-b951-d872f2087c98
parent 21fac242
......@@ -361,7 +361,7 @@ static_library("ui") {
}
}
if (is_desktop_linux) {
sources += rebase_path(gypi_values.chrome_browser_desktop_linux_sources,
sources += rebase_path(gypi_values.chrome_browser_ui_desktop_linux_sources,
".", "//chrome")
}
if (is_linux) { # Both desktop Linux and ChromeOS.
......
......@@ -2460,7 +2460,7 @@
'browser/ui/webui/certificate_viewer_webui.h',
],
# Desktop Linux. Assume aura/ash/views.
'chrome_browser_desktop_linux_sources': [
'chrome_browser_ui_desktop_linux_sources': [
'browser/ui/views/app_list/linux/app_list_linux.cc',
'browser/ui/views/app_list/linux/app_list_linux.h',
'browser/ui/views/app_list/linux/app_list_service_linux.cc',
......@@ -2883,7 +2883,7 @@
],
}],
['desktop_linux==1', {
'sources': [ '<@(chrome_browser_desktop_linux_sources)' ],
'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ],
}],
['OS=="linux"', { # Both desktop Linux and ChromeOS.
'sources': [ '<@(chrome_browser_ui_linux_sources)' ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment