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

Side by Side Diff: content/content.gyp

Issue 1198513003: Revert "Adding Chrome-side WebVR interface and Cardboard implementation" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 6 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 | « content/common/vr_service.mojom ('k') | content/content_browser.gypi » ('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 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' , 9 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' ,
10 }, 10 },
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 'includes': [ '../build/jar_file_jni_generator.gypi' ], 582 'includes': [ '../build/jar_file_jni_generator.gypi' ],
583 }, 583 },
584 { 584 {
585 'target_name': 'content_jni_headers', 585 'target_name': 'content_jni_headers',
586 'type': 'none', 586 'type': 'none',
587 'dependencies': [ 587 'dependencies': [
588 'java_set_jni_headers', 588 'java_set_jni_headers',
589 'motionevent_jni_headers' 589 'motionevent_jni_headers'
590 ], 590 ],
591 'includes': [ 'content_jni.gypi' ], 591 'includes': [ 'content_jni.gypi' ],
592 'conditions': [
593 ['enable_webvr==1', {
594 'sources': [
595 'public/android/java/src/org/chromium/content/browser/input/Card boardVRDevice.java',
596 ],
597 'dependencies': [
598 '../third_party/cardboard-java/cardboard.gyp:cardboard_jar',
599 ],
600 }],
601 ],
602 }, 592 },
603 { 593 {
604 'target_name': 'content_icudata', 594 'target_name': 'content_icudata',
605 'type': 'none', 595 'type': 'none',
606 'conditions': [ 596 'conditions': [
607 ['icu_use_data_file_flag==1', { 597 ['icu_use_data_file_flag==1', {
608 'copies': [ 598 'copies': [
609 { 599 {
610 'destination': '<(PRODUCT_DIR)/content_shell/assets', 600 'destination': '<(PRODUCT_DIR)/content_shell/assets',
611 'files': [ 601 'files': [
(...skipping 18 matching lines...) Expand all
630 ], 620 ],
631 }, 621 },
632 ], 622 ],
633 }], 623 }],
634 ], 624 ],
635 }, 625 },
636 ], 626 ],
637 }], # OS == "android" 627 }], # OS == "android"
638 ], 628 ],
639 } 629 }
OLDNEW
« no previous file with comments | « content/common/vr_service.mojom ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698