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

Side by Side Diff: url/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 | « net/test/run_all_unittests.cc ('k') | url/android/url_jni_registrar.h » ('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("//testing/test.gni") 6 import("//testing/test.gni")
7 import("features.gni") 7 import("features.gni")
8 8
9 if (is_android) { 9 if (is_android) {
10 import("//build/config/android/rules.gni") 10 import("//build/config/android/rules.gni")
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 ] 66 ]
67 67
68 if (is_win) { 68 if (is_win) {
69 # Don't conflict with Windows' "url.dll". 69 # Don't conflict with Windows' "url.dll".
70 output_name = "url_lib" 70 output_name = "url_lib"
71 } 71 }
72 72
73 # ICU support. 73 # ICU support.
74 if (use_platform_icu_alternatives) { 74 if (use_platform_icu_alternatives) {
75 if (is_android) { 75 if (is_android) {
76 sources += [ 76 sources += [ "url_canon_icu_alternatives_android.cc" ]
77 "android/url_jni_registrar.cc",
78 "android/url_jni_registrar.h",
79 "url_canon_icu_alternatives_android.cc",
80 "url_canon_icu_alternatives_android.h",
81 ]
82 deps += [ 77 deps += [
83 ":url_features", 78 ":url_features",
84 ":url_java", 79 ":url_java",
85 ":url_jni_headers", 80 ":url_jni_headers",
86 "//base", 81 "//base",
87 "//base/third_party/dynamic_annotations", 82 "//base/third_party/dynamic_annotations",
88 ] 83 ]
89 } else if (is_ios) { 84 } else if (is_ios) {
90 sources += [ "url_canon_icu_alternatives_ios.mm" ] 85 sources += [ "url_canon_icu_alternatives_ios.mm" ]
91 } else { 86 } else {
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 164 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
170 165
171 if (!is_ios) { 166 if (!is_ios) {
172 deps += [ 167 deps += [
173 "//mojo/edk/system", 168 "//mojo/edk/system",
174 "//mojo/edk/test:test_support", 169 "//mojo/edk/test:test_support",
175 "//url/mojo:test_url_mojom_gurl", 170 "//url/mojo:test_url_mojom_gurl",
176 ] 171 ]
177 } 172 }
178 } 173 }
OLDNEW
« no previous file with comments | « net/test/run_all_unittests.cc ('k') | url/android/url_jni_registrar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698