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

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: Name change to GVR across the board 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/gvr/gvr_device.cc » ('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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 chrome_public_apk_tmpl_shared("chrome_public_apk") { 545 chrome_public_apk_tmpl_shared("chrome_public_apk") {
546 android_manifest = get_target_outputs(":chrome_public_apk_manifest") 546 android_manifest = get_target_outputs(":chrome_public_apk_manifest")
547 android_manifest = android_manifest[1] 547 android_manifest = android_manifest[1]
548 android_manifest_dep = ":chrome_public_apk_manifest" 548 android_manifest_dep = ":chrome_public_apk_manifest"
549 apk_name = "ChromePublic" 549 apk_name = "ChromePublic"
550 shared_libraries = [ ":chrome" ] 550 shared_libraries = [ ":chrome" ]
551 551
552 deps = [ 552 deps = [
553 ":chrome_public_apk_template_resources", 553 ":chrome_public_apk_template_resources",
554 ] 554 ]
555
556 if (enable_webvr) {
557 loadable_modules = [ "$root_out_dir/libgvr.so" ]
558 deps += [ "//third_party/gvr-android-sdk:libgvr_shared_library" ]
559 }
555 } 560 }
556 561
557 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") { 562 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") {
558 testonly = true 563 testonly = true
559 android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest") 564 android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest")
560 android_manifest = android_manifest[1] 565 android_manifest = android_manifest[1]
561 android_manifest_dep = ":chrome_sync_shell_apk_manifest" 566 android_manifest_dep = ":chrome_sync_shell_apk_manifest"
562 apk_name = "ChromeSyncShell" 567 apk_name = "ChromeSyncShell"
563 shared_libraries = [ ":chrome_sync_shell" ] 568 shared_libraries = [ ":chrome_sync_shell" ]
564 569
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 instrumentation_test_apk("chrome_sync_shell_test_apk") { 644 instrumentation_test_apk("chrome_sync_shell_test_apk") {
640 apk_name = "ChromeSyncShellTest" 645 apk_name = "ChromeSyncShellTest"
641 apk_under_test = ":chrome_sync_shell_apk" 646 apk_under_test = ":chrome_sync_shell_apk"
642 android_manifest = chrome_sync_shell_test_apk_manifest 647 android_manifest = chrome_sync_shell_test_apk_manifest
643 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 648 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
644 deps = [ 649 deps = [
645 ":chrome_sync_shell_test_apk_java", 650 ":chrome_sync_shell_test_apk_java",
646 ] 651 ]
647 proguard_enabled = !is_java_debug 652 proguard_enabled = !is_java_debug
648 } 653 }
OLDNEW
« no previous file with comments | « no previous file | device/vr/BUILD.gn » ('j') | device/vr/android/gvr/gvr_device.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698