Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side Diff: chrome/android/BUILD.gn

Issue 2490003003: Remove gvr SDK dependency (Closed)
Patch Set: rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 "//components/signin/core/browser/android:java", 259 "//components/signin/core/browser/android:java",
260 "//components/sync/android:sync_java", 260 "//components/sync/android:sync_java",
261 "//components/url_formatter/android:url_formatter_java", 261 "//components/url_formatter/android:url_formatter_java",
262 "//components/web_contents_delegate_android:web_contents_delegate_android_ java", 262 "//components/web_contents_delegate_android:web_contents_delegate_android_ java",
263 "//ui/base/mojo:mojo_bindings_java", 263 "//ui/base/mojo:mojo_bindings_java",
264 ] 264 ]
265 } 265 }
266 266
267 if (enable_vr_shell || enable_webvr) { 267 if (enable_vr_shell || enable_webvr) {
268 java_files += chrome_vr_java_sources 268 java_files += chrome_vr_java_sources
269 deps += [ 269 deps += [ "//third_party/gvr-android-sdk:gvr_common_java" ]
270 "//third_party/gvr-android-sdk:gvr_base_java",
271 "//third_party/gvr-android-sdk:gvr_common_java",
272 ]
273 } 270 }
274 } 271 }
275 272
276 action("chrome_android_java_google_api_keys_srcjar") { 273 action("chrome_android_java_google_api_keys_srcjar") {
277 script = "//build/android/gyp/java_google_api_keys.py" 274 script = "//build/android/gyp/java_google_api_keys.py"
278 _output_path = "$target_gen_dir/$target_name.srcjar" 275 _output_path = "$target_gen_dir/$target_name.srcjar"
279 outputs = [ 276 outputs = [
280 _output_path, 277 _output_path,
281 ] 278 ]
282 args = [ 279 args = [
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 "//content/test/data/android/geolocation.html", 451 "//content/test/data/android/geolocation.html",
455 "//content/test/data/android/media_permissions.html", 452 "//content/test/data/android/media_permissions.html",
456 "//content/test/data/android/webshare.html", 453 "//content/test/data/android/webshare.html",
457 "//content/test/data/media/getusermedia.html", 454 "//content/test/data/media/getusermedia.html",
458 "//content/test/data/media/session/", 455 "//content/test/data/media/session/",
459 "//content/test/data/media/webrtc_test_utilities.js", 456 "//content/test/data/media/webrtc_test_utilities.js",
460 ] 457 ]
461 458
462 if (enable_vr_shell) { 459 if (enable_vr_shell) {
463 java_files += [ "javatests/src/org/chromium/chrome/browser/vr_shell/VrShellT est.java" ] 460 java_files += [ "javatests/src/org/chromium/chrome/browser/vr_shell/VrShellT est.java" ]
464 deps += [ 461 deps += [ "//third_party/gvr-android-sdk:gvr_common_java" ]
465 "//third_party/gvr-android-sdk:gvr_base_java",
466 "//third_party/gvr-android-sdk:gvr_common_java",
467 ]
468 } 462 }
469 } 463 }
470 464
471 # Overrides icon / name defined in chrome_java_resources. 465 # Overrides icon / name defined in chrome_java_resources.
472 android_resources("chrome_public_apk_resources") { 466 android_resources("chrome_public_apk_resources") {
473 resource_dirs = [ "java/res_chromium" ] 467 resource_dirs = [ "java/res_chromium" ]
474 468
475 # Dep needed to ensure override works properly. 469 # Dep needed to ensure override works properly.
476 deps = [ 470 deps = [
477 ":chrome_java_resources", 471 ":chrome_java_resources",
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 instrumentation_test_apk("chrome_sync_shell_test_apk") { 768 instrumentation_test_apk("chrome_sync_shell_test_apk") {
775 apk_name = "ChromeSyncShellTest" 769 apk_name = "ChromeSyncShellTest"
776 apk_under_test = ":chrome_sync_shell_apk" 770 apk_under_test = ":chrome_sync_shell_apk"
777 android_manifest = chrome_sync_shell_test_apk_manifest 771 android_manifest = chrome_sync_shell_test_apk_manifest
778 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 772 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
779 deps = [ 773 deps = [
780 ":chrome_sync_shell_test_apk_java", 774 ":chrome_sync_shell_test_apk_java",
781 ] 775 ]
782 proguard_enabled = !is_java_debug 776 proguard_enabled = !is_java_debug
783 } 777 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698