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

Side by Side Diff: net/BUILD.gn

Issue 2215863002: Fix cronet build after JNI registration change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « components/cronet/android/cronet_library_loader.cc ('k') | net/android/net_jni_registrar.cc » ('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/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/chromecast_build.gni") 6 import("//build/config/chromecast_build.gni")
7 import("//build/config/compiler/compiler.gni") 7 import("//build/config/compiler/compiler.gni")
8 import("//build/config/crypto.gni") 8 import("//build/config/crypto.gni")
9 import("//build/config/features.gni") 9 import("//build/config/features.gni")
10 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 } 373 }
374 374
375 if (enable_websockets) { 375 if (enable_websockets) {
376 sources += gypi_values.net_websockets_sources 376 sources += gypi_values.net_websockets_sources
377 } 377 }
378 378
379 # ICU support. 379 # ICU support.
380 if (use_platform_icu_alternatives) { 380 if (use_platform_icu_alternatives) {
381 if (is_android) { 381 if (is_android) {
382 # Use ICU alternative on Android. 382 # Use ICU alternative on Android.
383 sources += [ 383 sources += [ "base/net_string_util_icu_alternatives_android.cc" ]
384 "base/net_string_util_icu_alternatives_android.cc",
385 "base/net_string_util_icu_alternatives_android.h",
386 ]
387 deps += [ ":net_jni_headers" ] 384 deps += [ ":net_jni_headers" ]
388 } else if (is_ios) { 385 } else if (is_ios) {
389 # Use ICU alternative on iOS. 386 # Use ICU alternative on iOS.
390 sources += [ "base/net_string_util_icu_alternatives_ios.mm" ] 387 sources += [ "base/net_string_util_icu_alternatives_ios.mm" ]
391 } else { 388 } else {
392 assert(false, 389 assert(false,
393 "ICU alternative is not implemented for platform: " + target_os) 390 "ICU alternative is not implemented for platform: " + target_os)
394 } 391 }
395 } else { 392 } else {
396 # Use ICU. 393 # Use ICU.
(...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after
2003 "url_request/url_request_fuzzer.cc", 2000 "url_request/url_request_fuzzer.cc",
2004 ] 2001 ]
2005 deps = [ 2002 deps = [
2006 ":net_fuzzer_test_support", 2003 ":net_fuzzer_test_support",
2007 ":test_support", 2004 ":test_support",
2008 "//base", 2005 "//base",
2009 "//net", 2006 "//net",
2010 ] 2007 ]
2011 dict = "data/fuzzer_dictionaries/net_url_request_fuzzer.dict" 2008 dict = "data/fuzzer_dictionaries/net_url_request_fuzzer.dict"
2012 } 2009 }
OLDNEW
« no previous file with comments | « components/cronet/android/cronet_library_loader.cc ('k') | net/android/net_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698