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

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

Issue 586913002: Add BookmarkUndoService to Android build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: suspend undo service during sync changes Created 6 years, 3 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
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 import("//components/nacl/nacl_defines.gni") 8 import("//components/nacl/nacl_defines.gni")
9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
10 # produces a conflict for the "grit" template so we have to only include one. 10 # produces a conflict for the "grit" template so we have to only include one.
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 "//ui/resources", 124 "//ui/resources",
125 ] 125 ]
126 126
127 forward_dependent_configs_from = [ 127 forward_dependent_configs_from = [
128 "//components/autofill/core/browser", 128 "//components/autofill/core/browser",
129 "//content/public/browser", 129 "//content/public/browser",
130 "//sql", 130 "//sql",
131 "//sync", 131 "//sync",
132 ] 132 ]
133 133
134 sources += rebase_path(gypi_values.chrome_browser_undo_sources,
135 ".", "//chrome")
136
134 if (!is_ios) { 137 if (!is_ios) {
135 sources += rebase_path(gypi_values.chrome_browser_non_ios_sources, 138 sources += rebase_path(gypi_values.chrome_browser_non_ios_sources,
136 ".", "//chrome") 139 ".", "//chrome")
137 #TODO(GYP) Add these sources: 140 #TODO(GYP) Add these sources:
138 # # These files are generated by GRIT. 141 # # These files are generated by GRIT.
139 # '<(grit_out_dir)/grit/component_extension_resources_map.cc', 142 # '<(grit_out_dir)/grit/component_extension_resources_map.cc',
140 # '<(grit_out_dir)/grit/theme_resources_map.cc', 143 # '<(grit_out_dir)/grit/theme_resources_map.cc',
141 # '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc', 144 # '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc',
142 # 145 #
143 # # This file is generated by 146 # # This file is generated by
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 ] 931 ]
929 } 932 }
930 933
931 if (enable_wifi_bootstrapping) { 934 if (enable_wifi_bootstrapping) {
932 sources += [ 935 sources += [
933 "local_discovery/wifi/mock_wifi_manager.cc", 936 "local_discovery/wifi/mock_wifi_manager.cc",
934 "local_discovery/wifi/mock_wifi_manager.h", 937 "local_discovery/wifi/mock_wifi_manager.h",
935 ] 938 ]
936 } 939 }
937 } 940 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698