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

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

Issue 894003005: Revert "Load web contents after tab is created." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/module_args/v8.gni") 7 import("//build/module_args/v8.gni")
8 import("//chrome/version.gni") 8 import("//chrome/version.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 import("//third_party/icu/config.gni") 10 import("//third_party/icu/config.gni")
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 ":resource_id_javagen", 107 ":resource_id_javagen",
108 "//chrome:page_info_connection_type_javagen", 108 "//chrome:page_info_connection_type_javagen",
109 "//chrome:content_setting_javagen", 109 "//chrome:content_setting_javagen",
110 "//chrome:content_settings_type_javagen", 110 "//chrome:content_settings_type_javagen",
111 ] 111 ]
112 112
113 DEPRECATED_java_in_dir = "java/src" 113 DEPRECATED_java_in_dir = "java/src"
114 } 114 }
115 115
116 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java 116 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
117 # GYP: //chrome/chrome_browser.gypi:add_web_contents_result_java
118 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java 117 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java
119 # GYP: //chrome/chrome_browser.gypi:profile_sync_service_model_type_selection_ja va 118 # GYP: //chrome/chrome_browser.gypi:profile_sync_service_model_type_selection_ja va
120 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java 119 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java
121 # GYP: //chrome/chrome_browser.gypi:toolbar_model_security_levels_java 120 # GYP: //chrome/chrome_browser.gypi:toolbar_model_security_levels_java
122 java_cpp_enum("chrome_android_java_enums_srcjar") { 121 java_cpp_enum("chrome_android_java_enums_srcjar") {
123 sources = [ 122 sources = [
124 "//chrome/browser/android/activity_type_ids.h", 123 "//chrome/browser/android/activity_type_ids.h",
125 "//chrome/browser/android/chrome_web_contents_delegate_android.h",
126 "//chrome/browser/android/tab_android.h", 124 "//chrome/browser/android/tab_android.h",
127 "//chrome/browser/profiles/profile_metrics.h", 125 "//chrome/browser/profiles/profile_metrics.h",
128 "//chrome/browser/sync/profile_sync_service_android.cc", 126 "//chrome/browser/sync/profile_sync_service_android.cc",
129 "//chrome/browser/ui/toolbar/toolbar_model.h", 127 "//chrome/browser/ui/toolbar/toolbar_model.h",
130 ] 128 ]
131 outputs = [ 129 outputs = [
132 "org/chromium/chrome/browser/ActivityTypeIds.java", 130 "org/chromium/chrome/browser/ActivityTypeIds.java",
133 "org/chromium/chrome/browser/AddWebContentsResult.java",
134 "org/chromium/chrome/browser/TabLoadStatus.java", 131 "org/chromium/chrome/browser/TabLoadStatus.java",
135 "org/chromium/chrome/browser/profiles/ProfileAccountManagementMetrics.java", 132 "org/chromium/chrome/browser/profiles/ProfileAccountManagementMetrics.java",
136 "org/chromium/chrome/browser/sync/ModelTypeSelection.java", 133 "org/chromium/chrome/browser/sync/ModelTypeSelection.java",
137 "org/chromium/chrome/browser/ui/toolbar/ToolbarModelSecurityLevel.java", 134 "org/chromium/chrome/browser/ui/toolbar/ToolbarModelSecurityLevel.java",
138 ] 135 ]
139 } 136 }
140 137
141 # GYP: //chrome/chrome_browser.gypi:app_banner_metrics_ids_java 138 # GYP: //chrome/chrome_browser.gypi:app_banner_metrics_ids_java
142 java_cpp_template("app_banner_metrics_ids_javagen") { 139 java_cpp_template("app_banner_metrics_ids_javagen") {
143 sources = [ 140 sources = [
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 ] 492 ]
496 } 493 }
497 494
498 zip("chrome_version_srcjar") { 495 zip("chrome_version_srcjar") {
499 inputs = [ 496 inputs = [
500 chrome_version_java_file, 497 chrome_version_java_file,
501 ] 498 ]
502 output = "$target_gen_dir/$target_name.srcjar" 499 output = "$target_gen_dir/$target_name.srcjar"
503 base_dir = chrome_version_java_dir 500 base_dir = chrome_version_java_dir
504 } 501 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698