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

Side by Side Diff: content/content.gyp

Issue 1306883009: Reland 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, 3 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_device_provider.h ('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 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 'includes': [ '../build/jar_file_jni_generator.gypi' ], 595 'includes': [ '../build/jar_file_jni_generator.gypi' ],
596 }, 596 },
597 { 597 {
598 'target_name': 'content_jni_headers', 598 'target_name': 'content_jni_headers',
599 'type': 'none', 599 'type': 'none',
600 'dependencies': [ 600 'dependencies': [
601 'java_set_jni_headers', 601 'java_set_jni_headers',
602 'motionevent_jni_headers' 602 'motionevent_jni_headers'
603 ], 603 ],
604 'includes': [ 'content_jni.gypi' ], 604 'includes': [ 'content_jni.gypi' ],
605 'conditions': [
606 ['enable_webvr==1', {
607 'sources': [
608 'public/android/java/src/org/chromium/content/browser/input/Card boardVRDevice.java',
609 ],
610 'dependencies': [
611 '../third_party/cardboard-java/cardboard.gyp:cardboard_jar',
612 ],
613 }],
614 ],
605 }, 615 },
606 { 616 {
607 'target_name': 'content_icudata', 617 'target_name': 'content_icudata',
608 'type': 'none', 618 'type': 'none',
609 'conditions': [ 619 'conditions': [
610 ['icu_use_data_file_flag==1', { 620 ['icu_use_data_file_flag==1', {
611 'copies': [ 621 'copies': [
612 { 622 {
613 'destination': '<(PRODUCT_DIR)/content_shell/assets', 623 'destination': '<(PRODUCT_DIR)/content_shell/assets',
614 'files': [ 624 'files': [
(...skipping 18 matching lines...) Expand all
633 ], 643 ],
634 }, 644 },
635 ], 645 ],
636 }], 646 }],
637 ], 647 ],
638 }, 648 },
639 ], 649 ],
640 }], # OS == "android" 650 }], # OS == "android"
641 ], 651 ],
642 } 652 }
OLDNEW
« no previous file with comments | « content/browser/vr/vr_device_provider.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698