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

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

Issue 1539043002: Pull SecurityStateModel out into a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix Created 4 years, 11 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/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//chrome/android/chrome_public_apk_tmpl.gni") 8 import("//chrome/android/chrome_public_apk_tmpl.gni")
9 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 # is really all that UI related here. 171 # is really all that UI related here.
172 if (android_java_ui) { 172 if (android_java_ui) {
173 DEPRECATED_java_in_dir = "java/src" 173 DEPRECATED_java_in_dir = "java/src"
174 174
175 srcjar_deps += [ 175 srcjar_deps += [
176 ":custom_tabs_service_aidl", 176 ":custom_tabs_service_aidl",
177 "//chrome:page_info_connection_type_javagen", 177 "//chrome:page_info_connection_type_javagen",
178 "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar", 178 "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar",
179 "//components/offline_pages:offline_pages_enums_java", 179 "//components/offline_pages:offline_pages_enums_java",
180 "//components/omnibox/browser:autocomplete_match_type_javagen", 180 "//components/omnibox/browser:autocomplete_match_type_javagen",
181 "//components/security_state:security_state_enums_java",
181 ] 182 ]
182 183
183 deps += [ 184 deps += [
184 ":chrome_java_resources", 185 ":chrome_java_resources",
185 ":document_tab_model_info_proto_java", 186 ":document_tab_model_info_proto_java",
186 "//components/bookmarks/common/android:bookmarks_java", 187 "//components/bookmarks/common/android:bookmarks_java",
187 "//components/dom_distiller/android:dom_distiller_content_java", 188 "//components/dom_distiller/android:dom_distiller_content_java",
188 "//components/dom_distiller/android:dom_distiller_core_java", 189 "//components/dom_distiller/android:dom_distiller_core_java",
189 "//components/gcm_driver/android:gcm_driver_java", 190 "//components/gcm_driver/android:gcm_driver_java",
190 "//components/invalidation/impl:java", 191 "//components/invalidation/impl:java",
191 "//components/navigation_interception/android:navigation_interception_java ", 192 "//components/navigation_interception/android:navigation_interception_java ",
192 "//components/policy/android:policy_java", 193 "//components/policy/android:policy_java",
193 "//components/precache/android:precache_java", 194 "//components/precache/android:precache_java",
194 "//components/service_tab_launcher:service_tab_launcher_java", 195 "//components/service_tab_launcher:service_tab_launcher_java",
195 "//components/signin/core/browser/android:java", 196 "//components/signin/core/browser/android:java",
196 "//components/web_contents_delegate_android:web_contents_delegate_android_ java", 197 "//components/web_contents_delegate_android:web_contents_delegate_android_ java",
197 "//sync/android:sync_java", 198 "//sync/android:sync_java",
198 ] 199 ]
199 } 200 }
200 } 201 }
201 202
202 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java 203 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
203 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java 204 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java
204 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java 205 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java
205 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java 206 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java
206 # GYP: //chrome/chrome_browser.gypi:connection_security_levels_java
207 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java 207 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java
208 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java 208 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java
209 209
210 action("chrome_android_java_google_api_keys_srcjar") { 210 action("chrome_android_java_google_api_keys_srcjar") {
211 script = "//build/android/gyp/java_google_api_keys.py" 211 script = "//build/android/gyp/java_google_api_keys.py"
212 _output_path = "$target_gen_dir/$target_name.srcjar" 212 _output_path = "$target_gen_dir/$target_name.srcjar"
213 outputs = [ 213 outputs = [
214 _output_path, 214 _output_path,
215 ] 215 ]
216 args = [ 216 args = [
217 "--srcjar", 217 "--srcjar",
218 rebase_path(_output_path, root_build_dir), 218 rebase_path(_output_path, root_build_dir),
219 ] 219 ]
220 } 220 }
221 221
222 java_cpp_enum("chrome_android_java_enums_srcjar") { 222 java_cpp_enum("chrome_android_java_enums_srcjar") {
223 sources = [ 223 sources = [
224 "//chrome/browser/android/activity_type_ids.h", 224 "//chrome/browser/android/activity_type_ids.h",
225 "//chrome/browser/android/feedback/connectivity_checker.cc", 225 "//chrome/browser/android/feedback/connectivity_checker.cc",
226 "//chrome/browser/android/most_visited_sites.cc", 226 "//chrome/browser/android/most_visited_sites.cc",
227 "//chrome/browser/android/shortcut_info.h", 227 "//chrome/browser/android/shortcut_info.h",
228 "//chrome/browser/android/tab_android.h", 228 "//chrome/browser/android/tab_android.h",
229 "//chrome/browser/profiles/profile_metrics.h", 229 "//chrome/browser/profiles/profile_metrics.h",
230 "//chrome/browser/ssl/security_state_model.h",
231 "//chrome/browser/ui/android/infobars/infobar_android.h", 230 "//chrome/browser/ui/android/infobars/infobar_android.h",
232 ] 231 ]
233 } 232 }
234 233
235 # GYP: //chrome/chrome_browser.gypi:document_tab_model_info_proto_java 234 # GYP: //chrome/chrome_browser.gypi:document_tab_model_info_proto_java
236 proto_java_library("document_tab_model_info_proto_java") { 235 proto_java_library("document_tab_model_info_proto_java") {
237 proto_path = "java/src/org/chromium/chrome/browser/tabmodel/document" 236 proto_path = "java/src/org/chromium/chrome/browser/tabmodel/document"
238 sources = [ 237 sources = [
239 "$proto_path/document_tab_model_info.proto", 238 "$proto_path/document_tab_model_info.proto",
240 ] 239 ]
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 apk_name = "ChromeSyncShellTest" 566 apk_name = "ChromeSyncShellTest"
568 apk_under_test = ":chrome_sync_shell_apk" 567 apk_under_test = ":chrome_sync_shell_apk"
569 android_manifest = chrome_sync_shell_test_apk_manifest 568 android_manifest = chrome_sync_shell_test_apk_manifest
570 deps = [ 569 deps = [
571 ":chrome_sync_shell_test_apk_java", 570 ":chrome_sync_shell_test_apk_java",
572 ":chrome_sync_shell_test_apk_manifest", 571 ":chrome_sync_shell_test_apk_manifest",
573 ] 572 ]
574 isolate_file = "../chrome_sync_shell_test_apk.isolate" 573 isolate_file = "../chrome_sync_shell_test_apk.isolate"
575 proguard_enabled = !is_debug 574 proguard_enabled = !is_debug
576 } 575 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/chrome_apk.gyp » ('j') | components/security_state/security_state_model.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698