Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: chrome/browser/extensions/BUILD.gn

Issue 607603002: [Athena] Tempolarily exclude extensions API that are causing crash on Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/browser_context_keyed_service_factories.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 8
9 gypi_values = exec_script( 9 gypi_values = exec_script(
10 "//build/gypi_to_gn.py", 10 "//build/gypi_to_gn.py",
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 gypi_values.chrome_browser_extensions_non_chromeos_sources, 97 gypi_values.chrome_browser_extensions_non_chromeos_sources,
98 ".", "//chrome") 98 ".", "//chrome")
99 } 99 }
100 100
101 if (use_ash) { 101 if (use_ash) {
102 sources += [ 102 sources += [
103 "api/tabs/ash_panel_contents.cc", 103 "api/tabs/ash_panel_contents.cc",
104 "api/tabs/ash_panel_contents.h", 104 "api/tabs/ash_panel_contents.h",
105 ] 105 ]
106 } 106 }
107 if (!use_athena) {
108 sources += rebase_path(
109 gypi_values.chrome_browser_extensions_non_athena_sources,
110 ".", "//chrome")
111 }
107 112
108 if (is_linux) { 113 if (is_linux) {
109 configs += [ "//build/config/linux:fontconfig" ] 114 configs += [ "//build/config/linux:fontconfig" ]
110 deps += [ "//dbus" ] 115 deps += [ "//dbus" ]
111 if (use_x11) { 116 if (use_x11) {
112 configs += [ 117 configs += [
113 "//build/config/linux:x11", 118 "//build/config/linux:x11",
114 ] 119 ]
115 deps += [ 120 deps += [
116 "//ui/events:events_base", 121 "//ui/events:events_base",
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 gypi_values.chrome_browser_extensions_app_list_sources, 205 gypi_values.chrome_browser_extensions_app_list_sources,
201 ".", "//chrome") 206 ".", "//chrome")
202 } 207 }
203 208
204 if (!use_ozone) { 209 if (!use_ozone) {
205 sources -= [ 210 sources -= [
206 "global_shortcut_listener_ozone.cc", 211 "global_shortcut_listener_ozone.cc",
207 ] 212 ]
208 } 213 }
209 } 214 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/browser_context_keyed_service_factories.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698