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