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

Side by Side Diff: content/content.gyp

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 | « chrome/android/BUILD.gn ('k') | content/public/android/BUILD.gn » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine. 8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine.
9 }, 9 },
10 'target_defaults': { 10 'target_defaults': {
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 }, 682 },
683 'includes': [ '../build/jar_file_jni_generator.gypi' ], 683 'includes': [ '../build/jar_file_jni_generator.gypi' ],
684 }, 684 },
685 { 685 {
686 'target_name': 'content_jni_headers', 686 'target_name': 'content_jni_headers',
687 'type': 'none', 687 'type': 'none',
688 'dependencies': [ 688 'dependencies': [
689 'java_set_jni_headers', 689 'java_set_jni_headers',
690 ], 690 ],
691 'includes': [ 'content_jni.gypi' ], 691 'includes': [ 'content_jni.gypi' ],
692 'conditions': [
693 ['enable_webvr==1', {
694 'sources': [
695 'public/android/java/src/org/chromium/content/browser/input/Card boardVRDevice.java',
696 ],
697 'dependencies': [
698 '../third_party/cardboard-java/cardboard.gyp:cardboard_jar',
699 ],
700 }],
701 ],
692 }, 702 },
693 { 703 {
694 'target_name': 'content_shell_assets_copy', 704 'target_name': 'content_shell_assets_copy',
695 'type': 'none', 705 'type': 'none',
696 'dependencies': ['content_shell_and_tests.gyp:content_shell_pak'], 706 'dependencies': ['content_shell_and_tests.gyp:content_shell_pak'],
697 'variables': { 707 'variables': {
698 'src_files': ['<(PRODUCT_DIR)/content_shell.pak'], 708 'src_files': ['<(PRODUCT_DIR)/content_shell.pak'],
699 'conditions': [ 709 'conditions': [
700 ['v8_use_external_startup_data==1', { 710 ['v8_use_external_startup_data==1', {
701 'dependencies': ['<(DEPTH)/v8/src/v8.gyp:v8_external_snapshot'], 711 'dependencies': ['<(DEPTH)/v8/src/v8.gyp:v8_external_snapshot'],
(...skipping 16 matching lines...) Expand all
718 }, 728 },
719 'includes': [ 729 'includes': [
720 '../build/android/copy_ex.gypi', 730 '../build/android/copy_ex.gypi',
721 '../build/android/v8_external_startup_data_arch_suffix.gypi', 731 '../build/android/v8_external_startup_data_arch_suffix.gypi',
722 ], 732 ],
723 }, 733 },
724 ], 734 ],
725 }], # OS == "android" 735 }], # OS == "android"
726 ], 736 ],
727 } 737 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698