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

Side by Side Diff: content/content.gyp

Issue 1274913004: Revert of Android WebVR implementation, Cardboard 0.5.5 SDK (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « content/browser/vr/vr_transform_util_unittest.cc ('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 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 'includes': [ '../build/jar_file_jni_generator.gypi' ], 603 'includes': [ '../build/jar_file_jni_generator.gypi' ],
604 }, 604 },
605 { 605 {
606 'target_name': 'content_jni_headers', 606 'target_name': 'content_jni_headers',
607 'type': 'none', 607 'type': 'none',
608 'dependencies': [ 608 'dependencies': [
609 'java_set_jni_headers', 609 'java_set_jni_headers',
610 'motionevent_jni_headers' 610 'motionevent_jni_headers'
611 ], 611 ],
612 'includes': [ 'content_jni.gypi' ], 612 'includes': [ 'content_jni.gypi' ],
613 'conditions': [
614 ['enable_webvr==1', {
615 'sources': [
616 'public/android/java/src/org/chromium/content/browser/input/Card boardVRDevice.java',
617 ],
618 'dependencies': [
619 '../third_party/cardboard-java/cardboard.gyp:cardboard_jar',
620 ],
621 }],
622 ],
623 }, 613 },
624 { 614 {
625 'target_name': 'content_icudata', 615 'target_name': 'content_icudata',
626 'type': 'none', 616 'type': 'none',
627 'conditions': [ 617 'conditions': [
628 ['icu_use_data_file_flag==1', { 618 ['icu_use_data_file_flag==1', {
629 'copies': [ 619 'copies': [
630 { 620 {
631 'destination': '<(PRODUCT_DIR)/content_shell/assets', 621 'destination': '<(PRODUCT_DIR)/content_shell/assets',
632 'files': [ 622 'files': [
(...skipping 18 matching lines...) Expand all
651 ], 641 ],
652 }, 642 },
653 ], 643 ],
654 }], 644 }],
655 ], 645 ],
656 }, 646 },
657 ], 647 ],
658 }], # OS == "android" 648 }], # OS == "android"
659 ], 649 ],
660 } 650 }
OLDNEW
« no previous file with comments | « content/browser/vr/vr_transform_util_unittest.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698