| 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_overrides/v8.gni") | 7 import("//build_overrides/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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 "//third_party/WebKit/public:blink_headers_java", | 155 "//third_party/WebKit/public:blink_headers_java", |
| 156 "//media/base/android:media_java", | 156 "//media/base/android:media_java", |
| 157 "//media/midi:midi_java", | 157 "//media/midi:midi_java", |
| 158 "//ui/android:ui_java", | 158 "//ui/android:ui_java", |
| 159 "//ui/android:ui_java_resources", | 159 "//ui/android:ui_java_resources", |
| 160 google_play_services_library, | 160 google_play_services_library, |
| 161 ] | 161 ] |
| 162 | 162 |
| 163 srcjar_deps = [ | 163 srcjar_deps = [ |
| 164 ":chrome_android_java_enums_srcjar", | 164 ":chrome_android_java_enums_srcjar", |
| 165 ":chrome_android_java_google_api_keys_srcjar", |
| 165 ":chrome_version_srcjar", | 166 ":chrome_version_srcjar", |
| 166 ":custom_tabs_service_aidl", | 167 ":custom_tabs_service_aidl", |
| 167 ":resource_id_javagen", | 168 ":resource_id_javagen", |
| 168 "//chrome:page_info_connection_type_javagen", | 169 "//chrome:page_info_connection_type_javagen", |
| 169 "//chrome:content_setting_javagen", | 170 "//chrome:content_setting_javagen", |
| 170 "//chrome:content_settings_type_javagen", | 171 "//chrome:content_settings_type_javagen", |
| 171 "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar", | 172 "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar", |
| 172 "//components/offline_pages:offline_pages_enums_java", | 173 "//components/offline_pages:offline_pages_enums_java", |
| 173 ] | 174 ] |
| 174 | 175 |
| 175 DEPRECATED_java_in_dir = "java/src" | 176 DEPRECATED_java_in_dir = "java/src" |
| 176 } | 177 } |
| 177 | 178 |
| 178 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java | 179 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java |
| 179 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java | 180 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java |
| 180 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java | 181 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java |
| 181 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java | 182 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java |
| 182 # GYP: //chrome/chrome_browser.gypi:connection_security_levels_java | 183 # GYP: //chrome/chrome_browser.gypi:connection_security_levels_java |
| 183 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java | 184 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java |
| 184 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java | 185 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java |
| 186 |
| 187 java_google_api_keys("chrome_android_java_google_api_keys_srcjar") { |
| 188 } |
| 189 |
| 185 java_cpp_enum("chrome_android_java_enums_srcjar") { | 190 java_cpp_enum("chrome_android_java_enums_srcjar") { |
| 186 sources = [ | 191 sources = [ |
| 187 "//chrome/browser/android/activity_type_ids.h", | 192 "//chrome/browser/android/activity_type_ids.h", |
| 188 "//chrome/browser/android/feedback/connectivity_checker.cc", | 193 "//chrome/browser/android/feedback/connectivity_checker.cc", |
| 189 "//chrome/browser/android/most_visited_sites.cc", | 194 "//chrome/browser/android/most_visited_sites.cc", |
| 190 "//chrome/browser/android/shortcut_info.h", | 195 "//chrome/browser/android/shortcut_info.h", |
| 191 "//chrome/browser/android/tab_android.h", | 196 "//chrome/browser/android/tab_android.h", |
| 192 "//chrome/browser/profiles/profile_metrics.h", | 197 "//chrome/browser/profiles/profile_metrics.h", |
| 193 "//chrome/browser/ssl/security_state_model.h", | 198 "//chrome/browser/ssl/security_state_model.h", |
| 194 "//chrome/browser/ui/android/infobars/infobar_android.h", | 199 "//chrome/browser/ui/android/infobars/infobar_android.h", |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 # TODO(GYP,cjhopman): Does this need version code/name? | 445 # TODO(GYP,cjhopman): Does this need version code/name? |
| 441 apk_name = "ChromePublicTest" | 446 apk_name = "ChromePublicTest" |
| 442 apk_under_test = ":chrome_public_apk" | 447 apk_under_test = ":chrome_public_apk" |
| 443 android_manifest = chrome_public_test_apk_manifest | 448 android_manifest = chrome_public_test_apk_manifest |
| 444 deps = [ | 449 deps = [ |
| 445 ":chrome_public_test_apk_manifest", | 450 ":chrome_public_test_apk_manifest", |
| 446 "//chrome/android:chrome_shared_test_java", | 451 "//chrome/android:chrome_shared_test_java", |
| 447 ] | 452 ] |
| 448 isolate_file = "../chrome_public_test_apk.isolate" | 453 isolate_file = "../chrome_public_test_apk.isolate" |
| 449 } | 454 } |
| OLD | NEW |