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("//android_webview/webview_repack_locales_list.gni") | 5 import("//android_webview/webview_repack_locales_list.gni") |
6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") |
7 import("//build/config/android/rules.gni") | 7 import("//build/config/android/rules.gni") |
8 import("//build/util/process_version.gni") | 8 import("//build/util/process_version.gni") |
9 import("//build_overrides/v8.gni") | 9 import("//build_overrides/v8.gni") |
10 import("//chrome/android/chrome_public_apk_tmpl.gni") | 10 import("//chrome/android/chrome_public_apk_tmpl.gni") |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
239 "//components/precache/android:precache_java", | 239 "//components/precache/android:precache_java", |
240 "//components/safe_json/android:safe_json_java", | 240 "//components/safe_json/android:safe_json_java", |
241 "//components/signin/core/browser/android:java", | 241 "//components/signin/core/browser/android:java", |
242 "//components/sync/android:sync_java", | 242 "//components/sync/android:sync_java", |
243 "//components/url_formatter/android:url_formatter_java", | 243 "//components/url_formatter/android:url_formatter_java", |
244 "//components/web_contents_delegate_android:web_contents_delegate_android_ java", | 244 "//components/web_contents_delegate_android:web_contents_delegate_android_ java", |
245 "//ui/base/mojo:mojo_bindings_java", | 245 "//ui/base/mojo:mojo_bindings_java", |
246 ] | 246 ] |
247 } | 247 } |
248 | 248 |
249 # VrActivity currently depends on ChromeTabbedActivity which is part of | 249 if ((enable_vr_shell || enable_webvr) && android_java_ui) { |
agrieve
2016/10/05 19:04:58
nit: remove android_java_ui (here and in the other
bshe
2016/10/05 19:53:06
Done.
| |
250 # android_java_ui. | |
251 if (enable_vr_shell && android_java_ui) { | |
252 java_files += chrome_vr_java_sources | 250 java_files += chrome_vr_java_sources |
253 deps += [ | 251 deps += [ |
254 "//third_party/gvr-android-sdk:gvr_base_java", | 252 "//third_party/gvr-android-sdk:gvr_base_java", |
255 "//third_party/gvr-android-sdk:gvr_common_java", | 253 "//third_party/gvr-android-sdk:gvr_common_java", |
256 ] | 254 ] |
257 } | 255 } |
258 } | 256 } |
259 | 257 |
260 action("chrome_android_java_google_api_keys_srcjar") { | 258 action("chrome_android_java_google_api_keys_srcjar") { |
261 script = "//build/android/gyp/java_google_api_keys.py" | 259 script = "//build/android/gyp/java_google_api_keys.py" |
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
730 instrumentation_test_apk("chrome_sync_shell_test_apk") { | 728 instrumentation_test_apk("chrome_sync_shell_test_apk") { |
731 apk_name = "ChromeSyncShellTest" | 729 apk_name = "ChromeSyncShellTest" |
732 apk_under_test = ":chrome_sync_shell_apk" | 730 apk_under_test = ":chrome_sync_shell_apk" |
733 android_manifest = chrome_sync_shell_test_apk_manifest | 731 android_manifest = chrome_sync_shell_test_apk_manifest |
734 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" | 732 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" |
735 deps = [ | 733 deps = [ |
736 ":chrome_sync_shell_test_apk_java", | 734 ":chrome_sync_shell_test_apk_java", |
737 ] | 735 ] |
738 proguard_enabled = !is_java_debug | 736 proguard_enabled = !is_java_debug |
739 } | 737 } |
OLD | NEW |