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

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

Powered by Google App Engine
This is Rietveld 408576698