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

Commit

Permalink
Merge pull request #358 from rakuco/make-disabling-webvr-work
Browse files Browse the repository at this point in the history
[Temp] Make |enable_webvr==0| work.
  • Loading branch information
Raphael Kubo da Costa committed Jun 8, 2016
2 parents fea8ed3 + de4e94e commit f458695
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion content/content.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,11 @@
'has_java_resources': 1,
'R_package': 'org.chromium.content',
'R_package_relpath': 'org/chromium/content',
'conditions': [
['enable_webvr==1', {
'additional_src_dirs': ['../content/public/android/java-optional'],
}],
],
},
'includes': [ '../build/java.gypi' ],
},
Expand Down Expand Up @@ -632,7 +637,7 @@
'conditions': [
['enable_webvr==1', {
'sources': [
'public/android/java/src/org/chromium/content/browser/input/CardboardVRDevice.java',
'public/android/java-optional/src/org/chromium/content/browser/input/CardboardVRDevice.java',
],
'dependencies': [
'../third_party/cardboard-java/cardboard.gyp:cardboard_jar',
Expand Down

0 comments on commit f458695

Please sign in to comment.