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

Commit

Permalink
[Temp] Make |enable_webvr==0| work.
Browse files Browse the repository at this point in the history
**IMPORTANT**
We actually intend to fix this properly. We are cherry-picking this
commit from the crosswalk-18 branch first in order to have a stable
baseline with no WebVR support propagating from Crosswalk 21 to 20 to
19. After that, we can start working on fixing this in 21 and 20 and, if
there is enough time, 19 too.

*From the original commit message:*

Move `CardboardVRDevice.java` to a different directory so that it is not
built by the `content_java` target even if `enable_webvr==0`.

This is a prerequisite for getting the code to build with
`enable_webvr=0`.

BUG=XWALK-6746

(cherry picked from commit e593418)
  • Loading branch information
Raphael Kubo da Costa authored and Mrunal Kapade committed Jun 15, 2016
1 parent f7f8e2d commit f5ab3be
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 @@ -496,6 +496,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 @@ -642,7 +647,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 f5ab3be

Please sign in to comment.