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

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

Issue 2258513003: Revert of 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 | content/content.gyp » ('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("//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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 forward_variables_from(invoker, "*") 533 forward_variables_from(invoker, "*")
534 534
535 native_lib_version_rule = "//build/util:chrome_version_json" 535 native_lib_version_rule = "//build/util:chrome_version_json"
536 536
537 deps += [ 537 deps += [
538 ":chrome_java", 538 ":chrome_java",
539 ":chrome_public_apk_assets", 539 ":chrome_public_apk_assets",
540 ":chrome_public_apk_resources", 540 ":chrome_public_apk_resources",
541 "//base:base_java", 541 "//base:base_java",
542 ] 542 ]
543
544 if (enable_webvr && !is_java_debug) {
545 proguard_configs = [ "//third_party/gvr-android-sdk/proguard/base.flags" ]
546 }
547 } 543 }
548 } 544 }
549 545
550 chrome_public_apk_tmpl_shared("chrome_public_apk") { 546 chrome_public_apk_tmpl_shared("chrome_public_apk") {
551 android_manifest = get_target_outputs(":chrome_public_apk_manifest") 547 android_manifest = get_target_outputs(":chrome_public_apk_manifest")
552 android_manifest = android_manifest[1] 548 android_manifest = android_manifest[1]
553 android_manifest_dep = ":chrome_public_apk_manifest" 549 android_manifest_dep = ":chrome_public_apk_manifest"
554 apk_name = "ChromePublic" 550 apk_name = "ChromePublic"
555 shared_libraries = [ ":chrome" ] 551 shared_libraries = [ ":chrome" ]
556 552
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 instrumentation_test_apk("chrome_sync_shell_test_apk") { 638 instrumentation_test_apk("chrome_sync_shell_test_apk") {
643 apk_name = "ChromeSyncShellTest" 639 apk_name = "ChromeSyncShellTest"
644 apk_under_test = ":chrome_sync_shell_apk" 640 apk_under_test = ":chrome_sync_shell_apk"
645 android_manifest = chrome_sync_shell_test_apk_manifest 641 android_manifest = chrome_sync_shell_test_apk_manifest
646 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 642 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
647 deps = [ 643 deps = [
648 ":chrome_sync_shell_test_apk_java", 644 ":chrome_sync_shell_test_apk_java",
649 ] 645 ]
650 proguard_enabled = !is_java_debug 646 proguard_enabled = !is_java_debug
651 } 647 }
OLDNEW
« no previous file with comments | « no previous file | content/content.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698