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

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

Issue 623883002: Revert "Move mojo edk into mojo/edk" (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/ui/BUILD.gn » ('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 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 "//components/storage_monitor", 165 "//components/storage_monitor",
166 "//components/translate/content/browser", 166 "//components/translate/content/browser",
167 "//components/url_matcher", 167 "//components/url_matcher",
168 "//components/visitedlink/browser", 168 "//components/visitedlink/browser",
169 "//components/visitedlink/common", 169 "//components/visitedlink/common",
170 "//components/web_cache/browser", 170 "//components/web_cache/browser",
171 "//components/web_modal", 171 "//components/web_modal",
172 "//content/app/resources", 172 "//content/app/resources",
173 "//media", 173 "//media",
174 "//media/cast:net", 174 "//media/cast:net",
175 "//mojo/edk/system",
176 "//mojo/environment:chromium", 175 "//mojo/environment:chromium",
177 "//mojo/public/cpp/bindings", 176 "//mojo/public/cpp/bindings",
178 "//mojo/public/js/bindings", 177 "//mojo/public/js/bindings",
178 "//mojo/system",
179 "//net:extras", 179 "//net:extras",
180 "//net:net_with_v8", 180 "//net:net_with_v8",
181 "//storage/browser", 181 "//storage/browser",
182 "//storage/common", 182 "//storage/common",
183 "//third_party/WebKit/public:resources", 183 "//third_party/WebKit/public:resources",
184 "//third_party/expat", 184 "//third_party/expat",
185 "//third_party/leveldatabase", 185 "//third_party/leveldatabase",
186 "//third_party/libaddressinput", 186 "//third_party/libaddressinput",
187 "//third_party/libyuv", 187 "//third_party/libyuv",
188 "//third_party/npapi", 188 "//third_party/npapi",
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 ] 921 ]
922 } 922 }
923 923
924 if (enable_wifi_bootstrapping) { 924 if (enable_wifi_bootstrapping) {
925 sources += [ 925 sources += [
926 "local_discovery/wifi/mock_wifi_manager.cc", 926 "local_discovery/wifi/mock_wifi_manager.cc",
927 "local_discovery/wifi/mock_wifi_manager.h", 927 "local_discovery/wifi/mock_wifi_manager.h",
928 ] 928 ]
929 } 929 }
930 } 930 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698