Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Issue 1130763004: Gets mandoline working on android (Closed)

Created:
5 years, 7 months ago by sky
Modified:
5 years, 7 months ago
CC:
chromium-reviews, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, yzshen+watch_chromium.org, abarth-chromium, Aaron Boodman, darin (slow to review), ben+mojo_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Gets mandoline working on android This consists of the following pieces: . html_viewer now uses ResourceProvider to get resources. . html_viewer no longer directly uses java. . The java support for mojo_runner/shell has been mode pluggable: . You specify the name of the .so to load by way of a meta-tag in the manifest. This way mandoline can specify it's own. . Android's main function calls to an InitContext() function that mandoline plugs in. . The apk can include resources to extract. These are listed in the file 'assets_list.' The gn template rule generate_mojo_shell_assets_list does this for you given a directory. . Changed around scripts to work with both mojo_shell/runner and mandoline. BUG=481698 TEST=covered by tests R=ben@chromim.org, jcivelli@chromium.org Committed: https://crrev.com/c55c0a6cab1f3d767318ac8c6fecba8546897dd5 Cr-Commit-Position: refs/heads/master@{#329250}

Patch Set 1 #

Patch Set 2 : tweaks #

Patch Set 3 : get windows working #

Total comments: 6

Patch Set 4 : merge #

Patch Set 5 : empty and old #

Total comments: 4

Patch Set 6 : feedback #

Unified diffs Side-by-side diffs Delta from patch set Stats (+350 lines, -180 lines) Patch
M components/html_viewer/BUILD.gn View 1 2 3 4 5 3 chunks +31 lines, -63 lines 0 comments Download
M components/html_viewer/DEPS View 2 chunks +2 lines, -0 lines 0 comments Download
D components/html_viewer/android/android_hooks.cc View 1 chunk +0 lines, -50 lines 0 comments Download
D components/html_viewer/android/java/org/chromium/html_viewer/Main.java View 1 chunk +0 lines, -25 lines 0 comments Download
M components/html_viewer/html_viewer.cc View 1 5 chunks +38 lines, -8 lines 0 comments Download
M mandoline/app/android/BUILD.gn View 2 chunks +62 lines, -5 lines 0 comments Download
M mandoline/app/android/apk/AndroidManifest.xml View 1 chunk +4 lines, -2 lines 0 comments Download
A mandoline/app/android/mandoline_context_init.cc View 1 1 chunk +16 lines, -0 lines 0 comments Download
M mandoline/tools/android_run_mandoline.py View 1 2 chunks +3 lines, -3 lines 0 comments Download
A mojo/generate_mojo_shell_assets_list.gni View 1 chunk +22 lines, -0 lines 0 comments Download
M mojo/runner/BUILD.gn View 10 chunks +39 lines, -8 lines 0 comments Download
M mojo/runner/android/apk/AndroidManifest.xml View 1 chunk +2 lines, -0 lines 0 comments Download
M mojo/runner/android/apk/src/org/chromium/mojo/shell/FileHelper.java View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java View 1 2 3 4 5 3 chunks +36 lines, -5 lines 0 comments Download
A mojo/runner/android/context_init.h View 1 1 chunk +19 lines, -0 lines 0 comments Download
A mojo/runner/android/context_init.cc View 1 1 chunk +14 lines, -0 lines 0 comments Download
M mojo/runner/android/main.cc View 1 2 3 2 chunks +2 lines, -0 lines 0 comments Download
A mojo/tools/generate_mojo_shell_assets_list.py View 1 chunk +46 lines, -0 lines 0 comments Download
M mojo/tools/mopy/android.py View 5 chunks +13 lines, -11 lines 0 comments Download

Messages

Total messages: 13 (3 generated)
sky
5 years, 7 months ago (2015-05-11 16:13:03 UTC) #1
sky
5 years, 7 months ago (2015-05-11 19:17:21 UTC) #3
Jay Civelli
https://codereview.chromium.org/1130763004/diff/40001/components/html_viewer/html_viewer.cc File components/html_viewer/html_viewer.cc (right): https://codereview.chromium.org/1130763004/diff/40001/components/html_viewer/html_viewer.cc#newcode190 components/html_viewer/html_viewer.cc:190: paths.insert("natives_blob.bin"); Should we use constants for these strings since ...
5 years, 7 months ago (2015-05-11 21:07:34 UTC) #4
sky
https://codereview.chromium.org/1130763004/diff/40001/components/html_viewer/html_viewer.cc File components/html_viewer/html_viewer.cc (right): https://codereview.chromium.org/1130763004/diff/40001/components/html_viewer/html_viewer.cc#newcode190 components/html_viewer/html_viewer.cc:190: paths.insert("natives_blob.bin"); On 2015/05/11 21:07:33, Jay Civelli wrote: > Should ...
5 years, 7 months ago (2015-05-11 21:13:35 UTC) #5
Jay Civelli
LGTM https://codereview.chromium.org/1130763004/diff/80001/mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java File mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java (right): https://codereview.chromium.org/1130763004/diff/80001/mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java#newcode57 mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java:57: && !line.equals("libbootstrap.so")) { Nit: you may want to ...
5 years, 7 months ago (2015-05-11 21:18:24 UTC) #6
Ben Goodger (Google)
lgtm https://codereview.chromium.org/1130763004/diff/80001/components/html_viewer/BUILD.gn File components/html_viewer/BUILD.gn (right): https://codereview.chromium.org/1130763004/diff/80001/components/html_viewer/BUILD.gn#newcode181 components/html_viewer/BUILD.gn:181: "$root_out_dir/ui_test.pak", this seems weird... I know you're just ...
5 years, 7 months ago (2015-05-11 21:26:22 UTC) #7
sky
https://codereview.chromium.org/1130763004/diff/80001/components/html_viewer/BUILD.gn File components/html_viewer/BUILD.gn (right): https://codereview.chromium.org/1130763004/diff/80001/components/html_viewer/BUILD.gn#newcode181 components/html_viewer/BUILD.gn:181: "$root_out_dir/ui_test.pak", On 2015/05/11 21:26:22, Ben Goodger (Google) wrote: > ...
5 years, 7 months ago (2015-05-11 21:34:21 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1130763004/100001
5 years, 7 months ago (2015-05-11 21:37:04 UTC) #11
commit-bot: I haz the power
Committed patchset #6 (id:100001)
5 years, 7 months ago (2015-05-11 22:15:00 UTC) #12
commit-bot: I haz the power
5 years, 7 months ago (2015-05-11 22:16:06 UTC) #13
Message was sent while issue was closed.
Patchset 6 (id:??) landed as
https://crrev.com/c55c0a6cab1f3d767318ac8c6fecba8546897dd5
Cr-Commit-Position: refs/heads/master@{#329250}

Powered by Google App Engine
This is Rietveld 408576698