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

next: Rebase patch controlling the WebVR build #383

Merged
merged 1 commit into from
Sep 2, 2016

Conversation

rakuco
Copy link
Member

@rakuco rakuco commented Sep 1, 2016

This patch set first reverts "[Temp] Make |enable_webvr==false| work in GN" (see my comment in accdb96) and later implements the same thing in the right files.

You can get rid of both the first commit and accdb96, as only "[Temp] Only depend on deviecs/vr when enable_webvr is on" is required in M53.

@rakuco
Copy link
Member Author

rakuco commented Sep 1, 2016

@Mrunal @msisov

rakuco referenced this pull request Sep 1, 2016
This is a change that should be squashed into "[Temp] Make
|enable_webvr==0| work", and just adds the required changes to the GN
build so that it is aware of the fact that CardboardVRDevice.java
resides in another directory.

BUG=XWALK-6746
@mrunalk
Copy link
Contributor

mrunalk commented Sep 1, 2016

@rakuco I have removed the commit so you don't need to revert it now but make sure to rebase your PR.

@rakuco
Copy link
Member Author

rakuco commented Sep 1, 2016

I'm no longer at work today, so I'll only be able to do that tomorrow. You can also just cherry-pick the patch if you prefer.

This is a backport of some of the build system bits of
http://crrev.com/2219203002 ("Migrate WebVR Cardboard implementation to
GVR"): we are not interested in the "move to GVR" part, but this change
also makes the dependency on some devices/vr targets optional based on
the value of `enable_webvr`, which is something we want in order to be
able to build Crosswalk with that flag off.

This commit will not be necessary once we move to M54 and incorporate
the CL mentioned above.

BUG=XWALK-6746
@rakuco rakuco changed the title Enable webvr m53 next: Rebase patch controlling the WebVR build Sep 2, 2016
@rakuco
Copy link
Member Author

rakuco commented Sep 2, 2016

rebased, merging.

@rakuco rakuco merged commit 8a286e3 into crosswalk-project:next Sep 2, 2016
@rakuco rakuco deleted the enable_webvr-m53 branch September 2, 2016 07:15
@rakuco
Copy link
Member Author

rakuco commented Sep 2, 2016

I'll take care of rolling DEPS.xwalk.

imreotto pushed a commit to tenta-browser/chromium-crosswalk that referenced this pull request Nov 2, 2017
If device list iteration was not finished during HandleInitialize,
observers would never be registered.

TBR=jdufault@google.com

(cherry picked from commit 59e6569)

Bug: 766781
Change-Id: Iecbcb83e48816142cb37d6db560841515d700b60
Reviewed-on: https://chromium-review.googlesource.com/675579
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Jacob Dufault <jdufault@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#503254}
Reviewed-on: https://chromium-review.googlesource.com/677471
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#383}
Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants