From de4e94e1a25497b09b79a82a9e47ab1b79a68e92 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Mon, 18 Apr 2016 19:31:30 +0200 Subject: [PATCH] [Temp] Make |enable_webvr==0| work. **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 e5934186311cdf68e737a88b6cf1dbf23eb0464a) --- content/content.gyp | 7 ++++++- .../chromium/content/browser/input/CardboardVRDevice.java | 0 2 files changed, 6 insertions(+), 1 deletion(-) rename content/public/android/{java => java-optional}/src/org/chromium/content/browser/input/CardboardVRDevice.java (100%) diff --git a/content/content.gyp b/content/content.gyp index 1cda568d9df88..7f2895c356460 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -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' ], }, @@ -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', diff --git a/content/public/android/java/src/org/chromium/content/browser/input/CardboardVRDevice.java b/content/public/android/java-optional/src/org/chromium/content/browser/input/CardboardVRDevice.java similarity index 100% rename from content/public/android/java/src/org/chromium/content/browser/input/CardboardVRDevice.java rename to content/public/android/java-optional/src/org/chromium/content/browser/input/CardboardVRDevice.java