Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.

Commit f458695

Browse files
author
Raphael Kubo da Costa
committed
Merge pull request #358 from rakuco/make-disabling-webvr-work
[Temp] Make |enable_webvr==0| work.
2 parents fea8ed3 + de4e94e commit f458695

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

content/content.gyp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,11 @@
486486
'has_java_resources': 1,
487487
'R_package': 'org.chromium.content',
488488
'R_package_relpath': 'org/chromium/content',
489+
'conditions': [
490+
['enable_webvr==1', {
491+
'additional_src_dirs': ['../content/public/android/java-optional'],
492+
}],
493+
],
489494
},
490495
'includes': [ '../build/java.gypi' ],
491496
},
@@ -632,7 +637,7 @@
632637
'conditions': [
633638
['enable_webvr==1', {
634639
'sources': [
635-
'public/android/java/src/org/chromium/content/browser/input/CardboardVRDevice.java',
640+
'public/android/java-optional/src/org/chromium/content/browser/input/CardboardVRDevice.java',
636641
],
637642
'dependencies': [
638643
'../third_party/cardboard-java/cardboard.gyp:cardboard_jar',

0 commit comments

Comments
 (0)