OLD | NEW |
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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 "//chrome:page_info_connection_type_javagen", | 162 "//chrome:page_info_connection_type_javagen", |
163 "//chrome:content_setting_javagen", | 163 "//chrome:content_setting_javagen", |
164 "//chrome:content_settings_type_javagen", | 164 "//chrome:content_settings_type_javagen", |
165 "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar", | 165 "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar", |
166 ] | 166 ] |
167 | 167 |
168 DEPRECATED_java_in_dir = "java/src" | 168 DEPRECATED_java_in_dir = "java/src" |
169 } | 169 } |
170 | 170 |
171 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java | 171 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java |
| 172 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java |
172 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java | 173 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java |
173 # GYP: //chrome/chrome_browser.gypi:profile_sync_service_model_type_selection_ja
va | 174 # GYP: //chrome/chrome_browser.gypi:profile_sync_service_model_type_selection_ja
va |
174 # GYP: //chrome/chrome_browser.gypi:connection_security_security_levels_java | 175 # GYP: //chrome/chrome_browser.gypi:connection_security_security_levels_java |
175 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java | 176 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java |
176 java_cpp_enum("chrome_android_java_enums_srcjar") { | 177 java_cpp_enum("chrome_android_java_enums_srcjar") { |
177 sources = [ | 178 sources = [ |
178 "//chrome/browser/android/activity_type_ids.h", | 179 "//chrome/browser/android/activity_type_ids.h", |
| 180 "//chrome/browser/android/feedback/connectivity_checker.cc", |
179 "//chrome/browser/android/tab_android.h", | 181 "//chrome/browser/android/tab_android.h", |
180 "//chrome/browser/profiles/profile_metrics.h", | 182 "//chrome/browser/profiles/profile_metrics.h", |
181 "//chrome/browser/ssl/connection_security.h", | 183 "//chrome/browser/ssl/connection_security.h", |
182 "//chrome/browser/sync/profile_sync_service_android.cc", | 184 "//chrome/browser/sync/profile_sync_service_android.cc", |
183 ] | 185 ] |
184 outputs = [ | 186 outputs = [ |
185 "org/chromium/chrome/browser/ActivityTypeIds.java", | 187 "org/chromium/chrome/browser/ActivityTypeIds.java", |
| 188 "org/chromium/chrome/browser/feedback/ConnectivityCheckResult.java", |
186 "org/chromium/chrome/browser/TabLoadStatus.java", | 189 "org/chromium/chrome/browser/TabLoadStatus.java", |
187 "org/chromium/chrome/browser/profiles/ProfileAccountManagementMetrics.java", | 190 "org/chromium/chrome/browser/profiles/ProfileAccountManagementMetrics.java", |
188 "org/chromium/chrome/browser/ssl/ConnectionSecurityLevel.java", | 191 "org/chromium/chrome/browser/ssl/ConnectionSecurityLevel.java", |
189 "org/chromium/chrome/browser/sync/ModelTypeSelection.java", | 192 "org/chromium/chrome/browser/sync/ModelTypeSelection.java", |
190 ] | 193 ] |
191 } | 194 } |
192 | 195 |
193 # GYP: //chrome/chrome_browser.gypi:document_tab_model_info_proto_java | 196 # GYP: //chrome/chrome_browser.gypi:document_tab_model_info_proto_java |
194 proto_java_library("document_tab_model_info_proto_java") { | 197 proto_java_library("document_tab_model_info_proto_java") { |
195 proto_path = "java/src/org/chromium/chrome/browser/tabmodel/document" | 198 proto_path = "java/src/org/chromium/chrome/browser/tabmodel/document" |
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
743 # TODO(GYP,cjhopman): Does this need version code/name? | 746 # TODO(GYP,cjhopman): Does this need version code/name? |
744 apk_name = "ChromePublicTest" | 747 apk_name = "ChromePublicTest" |
745 apk_under_test = ":chrome_public_apk" | 748 apk_under_test = ":chrome_public_apk" |
746 android_manifest = chrome_public_test_apk_manifest | 749 android_manifest = chrome_public_test_apk_manifest |
747 deps = [ | 750 deps = [ |
748 ":chrome_public_test_apk_manifest", | 751 ":chrome_public_test_apk_manifest", |
749 "//chrome/android:chrome_shared_test_java", | 752 "//chrome/android:chrome_shared_test_java", |
750 ] | 753 ] |
751 isolate_file = "../chrome_public_test_apk.isolate" | 754 isolate_file = "../chrome_public_test_apk.isolate" |
752 } | 755 } |
OLD | NEW |