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

Unified Diff: chrome/browser/BUILD.gn

Issue 673663004: Android: Do not build any extensions code except for extensions_constants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@zoom_controller
Patch Set: fix merge conflict 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/BUILD.gn ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 40dd295b01647827924aed86ee4c21998b162138..4b6df7b0beff2ac304f087be7a119559ac50c68d 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -267,6 +267,7 @@ static_library("browser") {
if (!use_aura || is_win || is_chromeos) {
sources -= [ "background/background_mode_manager_aura.cc" ]
}
+ defines += [ "ENABLE_BACKGROUND=1" ]
}
if (enable_task_manager) {
sources += rebase_path(gypi_values.chrome_browser_task_manager_sources,
@@ -743,8 +744,6 @@ source_set("test_support") {
"download/download_test_file_activity_observer.h",
"download/test_download_shelf.cc",
"download/test_download_shelf.h",
- "extensions/extension_action_test_util.cc",
- "extensions/extension_action_test_util.h",
"invalidation/fake_invalidation_service.cc",
"invalidation/fake_invalidation_service.h",
"media/fake_desktop_media_list.cc",
@@ -819,6 +818,10 @@ source_set("test_support") {
}
if (enable_extensions) {
+ sources += [
+ "extensions/extension_action_test_util.cc",
+ "extensions/extension_action_test_util.h",
+ ]
deps += [
"//extensions:test_support",
]
« no previous file with comments | « build/config/BUILD.gn ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698