| 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 "//chrome:content_settings_type_javagen", | 135 "//chrome:content_settings_type_javagen", |
| 136 "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar", | 136 "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar", |
| 137 ] | 137 ] |
| 138 | 138 |
| 139 DEPRECATED_java_in_dir = "java/src" | 139 DEPRECATED_java_in_dir = "java/src" |
| 140 } | 140 } |
| 141 | 141 |
| 142 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java | 142 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java |
| 143 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java | 143 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java |
| 144 # GYP: //chrome/chrome_browser.gypi:profile_sync_service_model_type_selection_ja
va | 144 # GYP: //chrome/chrome_browser.gypi:profile_sync_service_model_type_selection_ja
va |
| 145 # GYP: //chrome/chrome_browser.gypi:connection_security_helper_security_levels_j
ava | 145 # GYP: //chrome/chrome_browser.gypi:connection_security_security_levels_java |
| 146 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java | 146 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java |
| 147 java_cpp_enum("chrome_android_java_enums_srcjar") { | 147 java_cpp_enum("chrome_android_java_enums_srcjar") { |
| 148 sources = [ | 148 sources = [ |
| 149 "//chrome/browser/android/activity_type_ids.h", | 149 "//chrome/browser/android/activity_type_ids.h", |
| 150 "//chrome/browser/android/tab_android.h", | 150 "//chrome/browser/android/tab_android.h", |
| 151 "//chrome/browser/profiles/profile_metrics.h", | 151 "//chrome/browser/profiles/profile_metrics.h", |
| 152 "//chrome/browser/ssl/connection_security_helper.h", | 152 "//chrome/browser/ssl/connection_security.h", |
| 153 "//chrome/browser/sync/profile_sync_service_android.cc", | 153 "//chrome/browser/sync/profile_sync_service_android.cc", |
| 154 ] | 154 ] |
| 155 outputs = [ | 155 outputs = [ |
| 156 "org/chromium/chrome/browser/ActivityTypeIds.java", | 156 "org/chromium/chrome/browser/ActivityTypeIds.java", |
| 157 "org/chromium/chrome/browser/TabLoadStatus.java", | 157 "org/chromium/chrome/browser/TabLoadStatus.java", |
| 158 "org/chromium/chrome/browser/profiles/ProfileAccountManagementMetrics.java", | 158 "org/chromium/chrome/browser/profiles/ProfileAccountManagementMetrics.java", |
| 159 "org/chromium/chrome/browser/ssl/ConnectionSecurityHelperSecurityLevel.java"
, | 159 "org/chromium/chrome/browser/ssl/ConnectionSecurityLevel.java", |
| 160 "org/chromium/chrome/browser/sync/ModelTypeSelection.java", | 160 "org/chromium/chrome/browser/sync/ModelTypeSelection.java", |
| 161 ] | 161 ] |
| 162 } | 162 } |
| 163 | 163 |
| 164 # GYP: //chrome/chrome_browser.gypi:document_tab_model_info_proto_java | 164 # GYP: //chrome/chrome_browser.gypi:document_tab_model_info_proto_java |
| 165 proto_java_library("document_tab_model_info_proto_java") { | 165 proto_java_library("document_tab_model_info_proto_java") { |
| 166 proto_path = "java/src/org/chromium/chrome/browser/tabmodel/document" | 166 proto_path = "java/src/org/chromium/chrome/browser/tabmodel/document" |
| 167 sources = [ | 167 sources = [ |
| 168 "$proto_path/document_tab_model_info.proto", | 168 "$proto_path/document_tab_model_info.proto", |
| 169 ] | 169 ] |
| (...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 829 apk_name = "ChromePublicTest" | 829 apk_name = "ChromePublicTest" |
| 830 apk_under_test = ":chrome_public_apk" | 830 apk_under_test = ":chrome_public_apk" |
| 831 android_manifest = chrome_public_test_apk_manifest | 831 android_manifest = chrome_public_test_apk_manifest |
| 832 deps = [ | 832 deps = [ |
| 833 ":chrome_public_test_apk_manifest", | 833 ":chrome_public_test_apk_manifest", |
| 834 "//chrome/test/android:chrome_staging_test_support_java", | 834 "//chrome/test/android:chrome_staging_test_support_java", |
| 835 "//chrome/android:chrome_staging_test_java", | 835 "//chrome/android:chrome_staging_test_java", |
| 836 ] | 836 ] |
| 837 isolate_file = "../chrome_public_test_apk.isolate" | 837 isolate_file = "../chrome_public_test_apk.isolate" |
| 838 } | 838 } |
| OLD | NEW |