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

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

Issue 2219203002: Migrate WebVR Cardboard implementation to GVR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gvr_third_party
Patch Set: Created 4 years, 4 months 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 | device/vr/BUILD.gn » ('j') | device/vr/android/google_vr/google_vr_device.h » ('J')
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("//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/android/chrome_public_apk_tmpl.gni") 8 import("//chrome/android/chrome_public_apk_tmpl.gni")
9 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 chrome_public_apk_tmpl_shared("chrome_public_apk") { 525 chrome_public_apk_tmpl_shared("chrome_public_apk") {
526 android_manifest = get_target_outputs(":chrome_public_apk_manifest") 526 android_manifest = get_target_outputs(":chrome_public_apk_manifest")
527 android_manifest = android_manifest[1] 527 android_manifest = android_manifest[1]
528 android_manifest_dep = ":chrome_public_apk_manifest" 528 android_manifest_dep = ":chrome_public_apk_manifest"
529 apk_name = "ChromePublic" 529 apk_name = "ChromePublic"
530 shared_libraries = [ ":chrome" ] 530 shared_libraries = [ ":chrome" ]
531 531
532 deps = [ 532 deps = [
533 ":chrome_public_apk_template_resources", 533 ":chrome_public_apk_template_resources",
534 ] 534 ]
535
536 if (enable_webvr) {
537 loadable_modules = [ "$root_out_dir/libgvr.so" ]
538 deps += [ "//third_party/gvr-android-sdk:libgvr_shared_library" ]
539 }
535 } 540 }
536 541
537 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") { 542 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") {
538 testonly = true 543 testonly = true
539 android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest") 544 android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest")
540 android_manifest = android_manifest[1] 545 android_manifest = android_manifest[1]
541 android_manifest_dep = ":chrome_sync_shell_apk_manifest" 546 android_manifest_dep = ":chrome_sync_shell_apk_manifest"
542 apk_name = "ChromeSyncShell" 547 apk_name = "ChromeSyncShell"
543 shared_libraries = [ ":chrome_sync_shell" ] 548 shared_libraries = [ ":chrome_sync_shell" ]
544 549
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 instrumentation_test_apk("chrome_sync_shell_test_apk") { 625 instrumentation_test_apk("chrome_sync_shell_test_apk") {
621 apk_name = "ChromeSyncShellTest" 626 apk_name = "ChromeSyncShellTest"
622 apk_under_test = ":chrome_sync_shell_apk" 627 apk_under_test = ":chrome_sync_shell_apk"
623 android_manifest = chrome_sync_shell_test_apk_manifest 628 android_manifest = chrome_sync_shell_test_apk_manifest
624 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 629 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
625 deps = [ 630 deps = [
626 ":chrome_sync_shell_test_apk_java", 631 ":chrome_sync_shell_test_apk_java",
627 ] 632 ]
628 proguard_enabled = !is_java_debug 633 proguard_enabled = !is_java_debug
629 } 634 }
OLDNEW
« no previous file with comments | « no previous file | device/vr/BUILD.gn » ('j') | device/vr/android/google_vr/google_vr_device.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698