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

[Android] Make it possible to build content_shell_apk with GN. #377

Merged
merged 3 commits into from
Aug 25, 2016

Conversation

rakuco
Copy link
Member

@rakuco rakuco commented Aug 24, 2016

This pull request contains a few separate patches, all of which are required in order to be able to build the content_shell_apk target using GN with Crosswalk's local modifications on top of the upstream commits.

  • "[Temp] Make |enable_webvr==false| work in GN" and "[Android] Add ApplicationStatusManager.java to the GN build" just add some new or moved files to the respective BUILD.gn files. Their commit messages indicate which commits they should be squashed into in the future.
  • "[Backport] GN: Set |enable_webvr| in the declare_args() block" is a backport from a commit I landed upstream that makes it possible to override the value of enable_webvr (which we currently need to disable in Crosswalk).

Linux and Windows are out of the scope of this pull request: they will be handled separately in other PRs.

RELATED BUG=XWALK-3674

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
In the future, this change should be squashed into "[Android] Change the
API for ApplicationStatus in base dir". This patch adds the
newly-introduced ApplicationStatusManager.java to base/BUILD.gn (in GN
all files must be listed explicitly).
> This effectively makes it a configurable argument that can be changed by
> downstreams and users alike; so far, trying to change it via `gn args'
> failed with:
>
>   The variable "enable_webvr" was set as a build argument
>   but never appeared in a declare_args() block in any buildfile.
>
> BUG=389343
> R=bajones@chromium.org,brettw@chromium.org,dpranke@chromium.org
>
> Review-Url: https://codereview.chromium.org/2198003002
@crosswalk-trybot
Copy link

crosswalk-trybot commented Aug 24, 2016

Testing patch series with rakuco/chromium-crosswalk@2462584 as its head.

Bot Status
Content Shell Android-x86 [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Content Shell Android-x86/builds/330)
Content Shell Linux [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Content Shell Linux/builds/328)

@rakuco
Copy link
Member Author

rakuco commented Aug 24, 2016

@darktears @lincsoon @heke123: PTAL. While He Ke handles the Linux and common parts of the GN porting work, I'm trying to speed up the porting process for other platforms (especially since we'll likely need GN on Android to be working before we move to M53).

@mrunalk @msisov: FYI. These changes will be needed in M53. The ones which are not backports can be squashed directly into the original commits (it's probably a good idea to edit the original commits' commit messages and add a note saying "M53 rebasing: added GN support" or something like that).

@mrunalk
Copy link
Contributor

mrunalk commented Aug 24, 2016

LGTM

@rakuco rakuco merged commit b5d9bfd into crosswalk-project:master Aug 25, 2016
@rakuco rakuco deleted the local-android-commits-gn branch August 25, 2016 07:37
imreotto pushed a commit to tenta-browser/chromium-crosswalk that referenced this pull request Nov 2, 2017
Change:
Make feedback private api use EventRouter::DispatchEventToExtension
when content::IsBrowserSideNavigationEnabled() is true.

TBR=weidongg@chromium.org, jam@chromium.org
BUG=764997
TEST=LoginFeedbackTest.Basic with flag --enable-browser-side-navigation

(cherry picked from commit 03d2194)

Change-Id: I3c8e9424a22d1cc1f8a95fe748549a4fec91eb1a
Reviewed-on: https://chromium-review.googlesource.com/667400
Commit-Queue: Weidong Guo <weidongg@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#502011}
Reviewed-on: https://chromium-review.googlesource.com/677483
Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#377}
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
3 participants