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

Issue 10377059: Android content shell bringup. (Closed)

Created:
8 years, 7 months ago by John Grabowski
Modified:
8 years, 7 months ago
CC:
chromium-reviews, cbentzel+watch_chromium.org, erikwright (departed), jam, joi+watch-content_chromium.org, feature-media-reviews_chromium.org, darin-cc_chromium.org, brettw-cc_chromium.org, navabi1, nilesh, Ted C
Visibility:
Public.

Description

Android content shell bringup. Build media java files (we weren't). Fix adb_install_content_shell for cases where the app was stuck. Add upstream staging gyp var / #define. Be more consistent about jar output files (all in lib.java). Upstream a bunch of random files (e.g. ppapi). Upstream a bunch of java and native code hit as part of shlib init. Properly package jar files in content shell. BUG= TEST= Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=136219

Patch Set 1 #

Total comments: 42

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : #

Total comments: 4

Patch Set 5 : #

Total comments: 1

Patch Set 6 : #

Total comments: 1

Patch Set 7 : sync/merge with head #

Patch Set 8 : fix deps so builds on clean machine #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1669 lines, -75 lines) Patch
M base/android/java/base.xml View 1 chunk +1 line, -1 line 0 comments Download
M build/android/adb_install_content_shell View 1 chunk +2 lines, -0 lines 0 comments Download
M build/android/envsetup.sh View 1 chunk +8 lines, -0 lines 0 comments Download
M build/android/gdb_content_shell View 2 chunks +4 lines, -2 lines 0 comments Download
M build/common.gypi View 3 chunks +9 lines, -0 lines 0 comments Download
M build/java.gypi View 1 2 chunks +2 lines, -2 lines 0 comments Download
M content/app/content_main_runner.cc View 1 2 3 4 5 8 chunks +25 lines, -4 lines 0 comments Download
A content/browser/android/command_line.h View 1 1 chunk +18 lines, -0 lines 0 comments Download
A content/browser/android/command_line.cc View 1 1 chunk +78 lines, -0 lines 0 comments Download
A content/browser/android/content_jni_registrar.h View 1 1 chunk +19 lines, -0 lines 0 comments Download
A content/browser/android/content_jni_registrar.cc View 1 1 chunk +26 lines, -0 lines 0 comments Download
A content/browser/android/jni_helper.h View 1 2 3 4 1 chunk +92 lines, -0 lines 0 comments Download
A content/browser/android/jni_helper.cc View 1 1 chunk +158 lines, -0 lines 0 comments Download
M content/browser/android/library_loader_hooks.cc View 1 4 chunks +24 lines, -6 lines 0 comments Download
A content/browser/android/trace_event_binding.h View 1 1 chunk +13 lines, -0 lines 0 comments Download
A content/browser/android/trace_event_binding.cc View 1 1 chunk +93 lines, -0 lines 0 comments Download
M content/content.gyp View 1 2 3 4 5 6 7 1 chunk +6 lines, -16 lines 0 comments Download
M content/content_browser.gypi View 1 2 3 4 5 6 2 chunks +11 lines, -3 lines 0 comments Download
A content/content_jni.gypi View 1 2 3 4 5 6 1 chunk +27 lines, -0 lines 0 comments Download
M content/content_shell.gypi View 1 2 chunks +16 lines, -2 lines 0 comments Download
M content/plugin/webplugin_proxy.cc View 1 chunk +10 lines, -0 lines 0 comments Download
M content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc View 1 2 chunks +21 lines, -0 lines 0 comments Download
M content/public/android/java/content.xml View 1 2 3 4 5 6 2 chunks +3 lines, -5 lines 0 comments Download
A content/public/android/java/org/chromium/content/browser/CommandLine.java View 1 2 3 1 chunk +467 lines, -0 lines 0 comments Download
A content/public/android/java/org/chromium/content/browser/JNIHelper.java View 1 1 chunk +71 lines, -0 lines 0 comments Download
A content/public/android/java/org/chromium/content/browser/LibraryLoader.java View 1 1 chunk +239 lines, -0 lines 0 comments Download
A content/public/android/java/org/chromium/content/browser/TraceEvent.java View 1 1 chunk +143 lines, -0 lines 0 comments Download
M content/shell/android/content_shell_apk.xml View 1 1 chunk +7 lines, -0 lines 0 comments Download
M content/shell/android/java/org/chromium/content_shell/ContentShellActivity.java View 1 4 chunks +11 lines, -21 lines 0 comments Download
M content/shell/android/java/org/chromium/content_shell/ContentShellApplication.java View 1 1 chunk +7 lines, -1 line 0 comments Download
M content/shell/android/shell_library_loader.cc View 1 2 3 chunks +34 lines, -4 lines 0 comments Download
M media/base/android/java/media.xml View 1 3 chunks +11 lines, -7 lines 0 comments Download
M media/media.gyp View 1 2 3 4 5 6 7 2 chunks +12 lines, -0 lines 0 comments Download
M net/android/java/net.xml View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 22 (0 generated)
John Grabowski
Please review all: yaron, satish (if available) OWNERS: mento: base/ jam: content/ fishman: media/
8 years, 7 months ago (2012-05-08 23:46:24 UTC) #1
Ami GONE FROM CHROMIUM
LGTM for media/media.gyp. I have no idea what media/base/android/java/media.xml is doing and expect one Yaron/Satish ...
8 years, 7 months ago (2012-05-08 23:54:32 UTC) #2
Mark Mentovai
LGTM. I only reviewed the files in base and build. http://chromiumcodereview.appspot.com/10377059/diff/1/build/java.gypi File build/java.gypi (right): http://chromiumcodereview.appspot.com/10377059/diff/1/build/java.gypi#newcode43 ...
8 years, 7 months ago (2012-05-09 00:05:36 UTC) #3
Ted C
http://chromiumcodereview.appspot.com/10377059/diff/1/content/browser/android/command_line.cc File content/browser/android/command_line.cc (right): http://chromiumcodereview.appspot.com/10377059/diff/1/content/browser/android/command_line.cc#newcode1 content/browser/android/command_line.cc:1: // Copyright (c) 2011 The Chromium Authors. All rights ...
8 years, 7 months ago (2012-05-09 00:26:41 UTC) #4
Yaron
http://chromiumcodereview.appspot.com/10377059/diff/1/build/android/adb_install_content_shell File build/android/adb_install_content_shell (right): http://chromiumcodereview.appspot.com/10377059/diff/1/build/android/adb_install_content_shell#newcode7 build/android/adb_install_content_shell:7: # install -r doesn't always work? Try uninstalling first. ...
8 years, 7 months ago (2012-05-09 01:01:42 UTC) #5
John Grabowski
Feedback applied except where noted. http://chromiumcodereview.appspot.com/10377059/diff/1/build/android/adb_install_content_shell File build/android/adb_install_content_shell (right): http://chromiumcodereview.appspot.com/10377059/diff/1/build/android/adb_install_content_shell#newcode7 build/android/adb_install_content_shell:7: # install -r doesn't ...
8 years, 7 months ago (2012-05-09 17:18:15 UTC) #6
Yaron
Just the one issue remaining for me http://chromiumcodereview.appspot.com/10377059/diff/1/content/shell/android/shell_library_loader.cc File content/shell/android/shell_library_loader.cc (right): http://chromiumcodereview.appspot.com/10377059/diff/1/content/shell/android/shell_library_loader.cc#newcode39 content/shell/android/shell_library_loader.cc:39: // That ...
8 years, 7 months ago (2012-05-09 17:31:46 UTC) #7
John Grabowski
http://chromiumcodereview.appspot.com/10377059/diff/1/content/shell/android/shell_library_loader.cc File content/shell/android/shell_library_loader.cc (right): http://chromiumcodereview.appspot.com/10377059/diff/1/content/shell/android/shell_library_loader.cc#newcode39 content/shell/android/shell_library_loader.cc:39: // That must be done before ContentMainRunner::Initialize(). On 2012/05/09 ...
8 years, 7 months ago (2012-05-09 17:44:34 UTC) #8
Yaron
lgtm
8 years, 7 months ago (2012-05-09 17:49:23 UTC) #9
Ted C
lgtm Although I disagree with the CommandLine stuff, it's not a blocker for me. http://chromiumcodereview.appspot.com/10377059/diff/1/content/public/android/java/org/chromium/content/browser/CommandLine.java ...
8 years, 7 months ago (2012-05-09 18:12:54 UTC) #10
John Grabowski
On 2012/05/09 18:12:54, Ted C wrote: > lgtm > > Although I disagree with the ...
8 years, 7 months ago (2012-05-09 18:21:41 UTC) #11
Avi (use Gerrit)
There is very little I can intelligently comment on. LGTM for owner role stuff; can ...
8 years, 7 months ago (2012-05-09 18:48:28 UTC) #12
John Grabowski
Thx for the review. http://chromiumcodereview.appspot.com/10377059/diff/1033/content/app/content_main_runner.cc File content/app/content_main_runner.cc (right): http://chromiumcodereview.appspot.com/10377059/diff/1033/content/app/content_main_runner.cc#newcode377 content/app/content_main_runner.cc:377: // On Android, do not ...
8 years, 7 months ago (2012-05-09 19:03:56 UTC) #13
Avi (use Gerrit)
http://chromiumcodereview.appspot.com/10377059/diff/8041/content/app/content_main_runner.cc File content/app/content_main_runner.cc (right): http://chromiumcodereview.appspot.com/10377059/diff/8041/content/app/content_main_runner.cc#newcode371 content/app/content_main_runner.cc:371: #if !defined(OS_ANDROID) Not what I meant. On line 401, ...
8 years, 7 months ago (2012-05-09 19:57:18 UTC) #14
John Grabowski
On 2012/05/09 19:57:18, Avi wrote: > http://chromiumcodereview.appspot.com/10377059/diff/8041/content/app/content_main_runner.cc > File content/app/content_main_runner.cc (right): > > http://chromiumcodereview.appspot.com/10377059/diff/8041/content/app/content_main_runner.cc#newcode371 > ...
8 years, 7 months ago (2012-05-09 20:24:05 UTC) #15
Avi (use Gerrit)
lgtm http://chromiumcodereview.appspot.com/10377059/diff/9037/content/app/content_main_runner.cc File content/app/content_main_runner.cc (right): http://chromiumcodereview.appspot.com/10377059/diff/9037/content/app/content_main_runner.cc#newcode376 content/app/content_main_runner.cc:376: // Thus, these are all disabled. Thanks!
8 years, 7 months ago (2012-05-09 21:01:34 UTC) #16
John Grabowski
+ evan for OWNERS of content/app/content_main_runner.cc
8 years, 7 months ago (2012-05-09 21:26:41 UTC) #17
Evan Martin
The change LGTM, but you probably want to find someone else for your reviews in ...
8 years, 7 months ago (2012-05-09 21:30:21 UTC) #18
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jrg@chromium.org/10377059/43
8 years, 7 months ago (2012-05-09 23:22:06 UTC) #19
commit-bot: I haz the power
Try job failure for 10377059-43 (retry) on android for steps "Compile, build". It's a second ...
8 years, 7 months ago (2012-05-09 23:36:47 UTC) #20
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jrg@chromium.org/10377059/1070
8 years, 7 months ago (2012-05-09 23:51:15 UTC) #21
commit-bot: I haz the power
8 years, 7 months ago (2012-05-10 01:50:50 UTC) #22
Change committed as 136219

Powered by Google App Engine
This is Rietveld 408576698