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

Side by Side Diff: net/BUILD.gn

Issue 1048863002: Remove android_webview_build conditions from various places. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | « media/media.gyp ('k') | net/net_common.gypi » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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("//build/module_args/v8.gni") 8 import("//build/module_args/v8.gni")
9 import("//url/config.gni") 9 import("//url/config.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 # are needed. 497 # are needed.
498 set_sources_assignment_filter([]) 498 set_sources_assignment_filter([])
499 sources += [ 499 sources += [
500 "base/address_tracker_linux.cc", 500 "base/address_tracker_linux.cc",
501 "base/address_tracker_linux.h", 501 "base/address_tracker_linux.h",
502 "base/net_util_linux.cc", 502 "base/net_util_linux.cc",
503 "base/net_util_linux.h", 503 "base/net_util_linux.h",
504 "base/platform_mime_util_linux.cc", 504 "base/platform_mime_util_linux.cc",
505 ] 505 ]
506 set_sources_assignment_filter(sources_assignment_filter) 506 set_sources_assignment_filter(sources_assignment_filter)
507 507 deps += [ ":net_jni_headers" ]
508 if (!is_android_webview_build) {
509 deps += [ ":net_jni_headers" ]
510 }
511 } 508 }
512 509
513 if (use_icu_alternatives_on_android) { 510 if (use_icu_alternatives_on_android) {
514 sources += [ 511 sources += [
515 "base/net_string_util_icu_alternatives_android.cc", 512 "base/net_string_util_icu_alternatives_android.cc",
516 "base/net_string_util_icu_alternatives_android.h", 513 "base/net_string_util_icu_alternatives_android.h",
517 ] 514 ]
518 } else { 515 } else {
519 deps += [ 516 deps += [
520 "//base:i18n", 517 "//base:i18n",
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1621 } else { 1618 } else {
1622 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1619 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1623 } 1620 }
1624 1621
1625 if (is_win && icu_use_data_file) { 1622 if (is_win && icu_use_data_file) {
1626 # This is needed to trigger the dll copy step on windows. 1623 # This is needed to trigger the dll copy step on windows.
1627 # TODO(mark): Specifying this here shouldn't be necessary. 1624 # TODO(mark): Specifying this here shouldn't be necessary.
1628 deps += [ "//third_party/icu:icudata" ] 1625 deps += [ "//third_party/icu:icudata" ]
1629 } 1626 }
1630 } 1627 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | net/net_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698