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

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

Issue 666813002: GN: Fix Android component build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-clank
Patch Set: Actually undo gyp change 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
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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 "//sync", 126 "//sync",
127 "//third_party/cacheinvalidation", 127 "//third_party/cacheinvalidation",
128 "//third_party/icu", 128 "//third_party/icu",
129 "//third_party/libxml", 129 "//third_party/libxml",
130 "//third_party/libjingle", 130 "//third_party/libjingle",
131 "//third_party/widevine/cdm:version_h", 131 "//third_party/widevine/cdm:version_h",
132 "//third_party/zlib", 132 "//third_party/zlib",
133 "//third_party/zlib:minizip", 133 "//third_party/zlib:minizip",
134 "//third_party/zlib:zip", 134 "//third_party/zlib:zip",
135 "//ui/base", 135 "//ui/base",
136 "//ui/events", 136 "//ui/events:events_base",
137 "//ui/gfx", 137 "//ui/gfx",
138 "//ui/gfx/geometry", 138 "//ui/gfx/geometry",
139 "//ui/message_center", 139 "//ui/message_center",
140 "//ui/shell_dialogs", 140 "//ui/shell_dialogs",
141 "//ui/strings", 141 "//ui/strings",
142 "//ui/resources", 142 "//ui/resources",
143 ] 143 ]
144 144
145 sources += rebase_path(gypi_values.chrome_browser_undo_sources, 145 sources += rebase_path(gypi_values.chrome_browser_undo_sources,
146 ".", "//chrome") 146 ".", "//chrome")
(...skipping 28 matching lines...) Expand all
175 "//components/storage_monitor", 175 "//components/storage_monitor",
176 "//components/translate/content/browser", 176 "//components/translate/content/browser",
177 "//components/url_matcher", 177 "//components/url_matcher",
178 "//components/visitedlink/browser", 178 "//components/visitedlink/browser",
179 "//components/visitedlink/common", 179 "//components/visitedlink/common",
180 "//components/web_cache/browser", 180 "//components/web_cache/browser",
181 "//components/web_modal", 181 "//components/web_modal",
182 "//content/app/resources", 182 "//content/app/resources",
183 "//media", 183 "//media",
184 "//media/cast:net", 184 "//media/cast:net",
185 "//mojo/common",
185 "//mojo/edk/system", 186 "//mojo/edk/system",
186 "//mojo/environment:chromium", 187 "//mojo/environment:chromium",
187 "//mojo/public/cpp/bindings", 188 "//mojo/public/cpp/bindings",
188 "//mojo/public/js/bindings", 189 "//mojo/public/js/bindings",
189 "//net:extras", 190 "//net:extras",
190 "//net:net_with_v8", 191 "//net:net_with_v8",
191 "//storage/browser", 192 "//storage/browser",
192 "//storage/common", 193 "//storage/common",
193 "//third_party/WebKit/public:resources", 194 "//third_party/WebKit/public:resources",
194 "//third_party/expat", 195 "//third_party/expat",
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 } 299 }
299 if (!is_chromeos) { 300 if (!is_chromeos) {
300 sources += rebase_path( 301 sources += rebase_path(
301 gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sources , 302 gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sources ,
302 ".", "//chrome") 303 ".", "//chrome")
303 } 304 }
304 if (is_win || is_mac || is_desktop_linux) { 305 if (is_win || is_mac || is_desktop_linux) {
305 sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources, 306 sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources,
306 ".", "//chrome") 307 ".", "//chrome")
307 } 308 }
308 if (!is_android && !is_ios) { # Non-mobile 309 if (is_android || is_ios) {
310 sources += rebase_path(gypi_values.chrome_browser_policy_mobile_sources,
311 ".", "//chrome")
312 } else {
309 deps += [ 313 deps += [
310 "//chrome/browser/policy:path_parser", 314 "//chrome/browser/policy:path_parser",
311 ] 315 ]
312 } 316 }
313 } else { 317 } else {
314 # Configuration policy disabled. 318 # Configuration policy disabled.
315 sources += rebase_path(gypi_values.chrome_browser_policy_disabled_sources, 319 sources += rebase_path(gypi_values.chrome_browser_policy_disabled_sources,
316 ".", "//chrome") 320 ".", "//chrome")
317 } 321 }
318 322
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 "//device/usb", 486 "//device/usb",
483 ] 487 ]
484 } 488 }
485 489
486 if (is_android) { 490 if (is_android) {
487 sources += rebase_path(gypi_values.chrome_browser_android_sources, 491 sources += rebase_path(gypi_values.chrome_browser_android_sources,
488 ".", "//chrome") 492 ".", "//chrome")
489 deps += [ 493 deps += [
490 ":jni_headers", 494 ":jni_headers",
491 "//components/cdm/browser", 495 "//components/cdm/browser",
492 #"../components/components.gyp:web_contents_delegate_android", TODO(GYP) 496 "//components/enhanced_bookmarks",
497 "//components/web_contents_delegate_android",
498 "//components/history/core/android",
499 "//third_party/android_opengl/etc1",
493 ] 500 ]
494 deps -= [ 501 deps -= [
495 "//third_party/libaddressinput", 502 "//third_party/libaddressinput",
496 "//components/feedback", 503 "//components/feedback",
497 "//components/storage_monitor", 504 "//components/storage_monitor",
498 "//components/web_modal", 505 "//components/web_modal",
499 ] 506 ]
500 } else { 507 } else {
501 sources += rebase_path(gypi_values.chrome_browser_non_android_sources, 508 sources += rebase_path(gypi_values.chrome_browser_non_android_sources,
502 ".", "//chrome") 509 ".", "//chrome")
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 ] 948 ]
942 } 949 }
943 950
944 if (enable_wifi_bootstrapping) { 951 if (enable_wifi_bootstrapping) {
945 sources += [ 952 sources += [
946 "local_discovery/wifi/mock_wifi_manager.cc", 953 "local_discovery/wifi/mock_wifi_manager.cc",
947 "local_discovery/wifi/mock_wifi_manager.h", 954 "local_discovery/wifi/mock_wifi_manager.h",
948 ] 955 ]
949 } 956 }
950 } 957 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698