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

Issue 12047068: Add apk for running content_browsertests (Closed)

Created:
7 years, 11 months ago by nilesh
Modified:
7 years, 10 months ago
CC:
chromium-reviews, sadrul, jam, joi+watch-content_chromium.org, darin-cc_chromium.org, erikwright+watch_chromium.org, jochen+watch_chromium.org
Visibility:
Public.

Description

Add apk for running content_browsertests Split off org.chromium.content_shell into: org.chromium.content_shell - content shell java code, builds a jar, directory structure similar to other jar targets org.chromium.content_shell_apk - application code to build content_shell_apk, directory structure similar to that of android application org.chromium.content_browsertests_apk - application code to build content_browsertests_apk Also splitting content/shell/android/res into: - content/shell/android/java/res - content/shell/android/shell_apk/res Both content_shell_apk and content_browsertests_apk will depend on content_shell_java target to include java/res needed to show a shell based browser. I will do another CL to move The java files for content_shell_tests_apk to content_shell_apk package. BUG=138275 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=179189

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : #

Total comments: 14

Patch Set 5 : Addressed comments #

Unified diffs Side-by-side diffs Delta from patch set Stats (+338 lines, -496 lines) Patch
M base/message_loop.h View 1 2 1 chunk +4 lines, -3 lines 0 comments Download
M base/message_loop.cc View 1 chunk +5 lines, -2 lines 0 comments Download
M base/test/test_support_android.cc View 1 chunk +2 lines, -1 line 0 comments Download
M build/java_apk.gypi View 1 2 3 4 2 chunks +3 lines, -5 lines 0 comments Download
M content/content.gyp View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M content/content_shell.gypi View 1 2 3 4 5 chunks +31 lines, -15 lines 0 comments Download
M content/content_tests.gypi View 1 2 3 4 4 chunks +24 lines, -7 lines 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/CommandLineTest.java View 1 chunk +2 lines, -2 lines 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java View 1 chunk +0 lines, -1 line 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java View 1 chunk +1 line, -1 line 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java View 1 chunk +1 line, -1 line 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java View 1 chunk +1 line, -1 line 0 comments Download
M content/public/test/content_test_suite_base.cc View 1 2 2 chunks +17 lines, -0 lines 0 comments Download
A + content/shell/android/browsertests_apk/AndroidManifest.xml View 1 chunk +4 lines, -4 lines 0 comments Download
A content/shell/android/browsertests_apk/content_browser_tests_android.cc View 1 2 3 4 1 chunk +127 lines, -0 lines 0 comments Download
A + content/shell/android/browsertests_apk/res/layout/test_activity.xml View 0 chunks +-1 lines, --1 lines 0 comments Download
A content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java View 1 chunk +46 lines, -0 lines 0 comments Download
A + content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java View 2 chunks +3 lines, -7 lines 0 comments Download
D content/shell/android/java/AndroidManifest.xml View 1 chunk +0 lines, -72 lines 0 comments Download
A + content/shell/android/java/res/drawable/progress.xml View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/shell/android/java/res/layout/shell_view.xml View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/shell/android/java/res/values/strings.xml View 0 chunks +-1 lines, --1 lines 0 comments Download
D content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java View 1 chunk +0 lines, -214 lines 0 comments Download
D content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java View 1 chunk +0 lines, -35 lines 0 comments Download
M content/shell/android/java/src/org/chromium/content_shell/ShellManager.java View 2 chunks +3 lines, -2 lines 0 comments Download
M content/shell/android/javatests/AndroidManifest.xml View 2 chunks +3 lines, -3 lines 0 comments Download
M content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java View 1 chunk +1 line, -0 lines 0 comments Download
M content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java View 1 chunk +1 line, -0 lines 0 comments Download
D content/shell/android/res/drawable/progress.xml View 1 chunk +0 lines, -13 lines 0 comments Download
D content/shell/android/res/layout/content_shell_activity.xml View 1 chunk +0 lines, -14 lines 0 comments Download
D content/shell/android/res/layout/shell_view.xml View 1 chunk +0 lines, -48 lines 0 comments Download
D content/shell/android/res/values/strings.xml View 1 chunk +0 lines, -11 lines 0 comments Download
A + content/shell/android/shell_apk/AndroidManifest.xml View 1 chunk +1 line, -1 line 0 comments Download
A + content/shell/android/shell_apk/res/layout/content_shell_activity.xml View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java View 4 chunks +4 lines, -3 lines 0 comments Download
A + content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java View 1 chunk +1 line, -1 line 0 comments Download
A + content/shell/android/shell_jni_registrar.h View 1 chunk +5 lines, -5 lines 0 comments Download
A content/shell/android/shell_jni_registrar.cc View 1 chunk +30 lines, -0 lines 0 comments Download
M content/shell/android/shell_library_loader.cc View 1 chunk +3 lines, -11 lines 0 comments Download
M content/test/content_test_launcher.cc View 3 chunks +19 lines, -0 lines 0 comments Download
M content/test/run_all_unittests.cc View 1 2 1 chunk +0 lines, -18 lines 0 comments Download

Messages

Total messages: 12 (0 generated)
nilesh
Hi, This is just adding the target to build the APK and provides a way ...
7 years, 11 months ago (2013-01-24 21:58:23 UTC) #1
nilesh
Actually adding reviewers this time. Hi, This is just adding the target to build the ...
7 years, 11 months ago (2013-01-24 22:39:14 UTC) #2
nilesh
mark: base/ jam: content/test and content/public/test
7 years, 11 months ago (2013-01-25 17:48:11 UTC) #3
Mark Mentovai
LGTM for base OWNERS review.
7 years, 11 months ago (2013-01-25 17:54:44 UTC) #4
cjhopman
https://codereview.chromium.org/12047068/diff/7005/build/java_apk.gypi File build/java_apk.gypi (right): https://codereview.chromium.org/12047068/diff/7005/build/java_apk.gypi#newcode43 build/java_apk.gypi:43: # (default: <PRODUCT_DIR>/<package_name>/assets). Change <PRODUCT_DIR>/<package_name>/assets to <(ant_build_out)/<(package_name)/assets. https://codereview.chromium.org/12047068/diff/7005/content/content_shell.gypi File ...
7 years, 11 months ago (2013-01-25 18:04:30 UTC) #5
Jay Civelli
lgtm https://codereview.chromium.org/12047068/diff/7005/content/shell/android/browsertests_apk/content_browser_tests_android.cc File content/shell/android/browsertests_apk/content_browser_tests_android.cc (right): https://codereview.chromium.org/12047068/diff/7005/content/shell/android/browsertests_apk/content_browser_tests_android.cc#newcode123 content/shell/android/browsertests_apk/content_browser_tests_android.cc:123: if (!RegisterNativesImpl(env)) { Nit: remove curly braces.
7 years, 11 months ago (2013-01-25 18:46:14 UTC) #6
Yaron
lgtm https://codereview.chromium.org/12047068/diff/7005/content/content_shell.gypi File content/content_shell.gypi (right): https://codereview.chromium.org/12047068/diff/7005/content/content_shell.gypi#newcode606 content/content_shell.gypi:606: ], nit: indentation
7 years, 11 months ago (2013-01-25 19:36:20 UTC) #7
nilesh
Addressed all comments. https://codereview.chromium.org/12047068/diff/7005/build/java_apk.gypi File build/java_apk.gypi (right): https://codereview.chromium.org/12047068/diff/7005/build/java_apk.gypi#newcode43 build/java_apk.gypi:43: # (default: <PRODUCT_DIR>/<package_name>/assets). On 2013/01/25 18:04:30, ...
7 years, 11 months ago (2013-01-26 01:25:59 UTC) #8
cjhopman
lgtm
7 years, 11 months ago (2013-01-26 01:28:07 UTC) #9
jam
lgtm
7 years, 10 months ago (2013-01-28 17:33:45 UTC) #10
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/nileshagrawal@chromium.org/12047068/15001
7 years, 10 months ago (2013-01-28 18:12:01 UTC) #11
commit-bot: I haz the power
7 years, 10 months ago (2013-01-28 21:21:02 UTC) #12
Message was sent while issue was closed.
Change committed as 179189

Powered by Google App Engine
This is Rietveld 408576698