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

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

Issue 344203006: Roll ANGLE DEPS for M37. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix commit_id dependent settings Created 6 years, 6 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 | « build/secondary/third_party/angle/angle_commit.h ('k') | no next file » | 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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//content/browser/browser.gni") 7 import("//content/browser/browser.gni")
8 8
9 source_set("browser") { 9 source_set("browser") {
10 # Only targets in the content tree can depend directly on this target. 10 # Only targets in the content tree can depend directly on this target.
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 "//third_party/leveldatabase", 93 "//third_party/leveldatabase",
94 "//third_party/libyuv", 94 "//third_party/libyuv",
95 "//ui/resources", 95 "//ui/resources",
96 "//ui/surface", 96 "//ui/surface",
97 "//ui/webui/resources", 97 "//ui/webui/resources",
98 "//webkit:resources", 98 "//webkit:resources",
99 "//webkit:strings", 99 "//webkit:strings",
100 "//webkit/browser:storage", 100 "//webkit/browser:storage",
101 "//webkit/common", 101 "//webkit/common",
102 "//webkit/common:storage", 102 "//webkit/common:storage",
103 # TODO(GYP) 103 "//third_party/angle:commit_id",
104 #"//third_party/angle:commit_id",
105 ] 104 ]
106 } 105 }
107 106
108 configs += [ 107 configs += [
109 "//content:content_implementation", 108 "//content:content_implementation",
110 "//content:libjingle_stub_config", # TODO(GYP) remove when libjingle is rea dy. 109 "//content:libjingle_stub_config", # TODO(GYP) remove when libjingle is rea dy.
111 "//content:webrtc_stub_config", # TODO(GYP) remove when webrtc is ready. 110 "//content:webrtc_stub_config", # TODO(GYP) remove when webrtc is ready.
112 ] 111 ]
113 112
114 if (toolkit_views) { 113 if (toolkit_views) {
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 sources -= [ 360 sources -= [
362 "geolocation/empty_wifi_data_provider.cc", 361 "geolocation/empty_wifi_data_provider.cc",
363 ] 362 ]
364 deps += [ "//dbus" ] 363 deps += [ "//dbus" ]
365 } else { 364 } else {
366 # This will already have gotten removed for all non-Linux cases. 365 # This will already have gotten removed for all non-Linux cases.
367 sources -= [ "geolocation/wifi_data_provider_linux.cc" ] 366 sources -= [ "geolocation/wifi_data_provider_linux.cc" ]
368 } 367 }
369 } 368 }
370 } 369 }
OLDNEW
« no previous file with comments | « build/secondary/third_party/angle/angle_commit.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698