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

Issue 12609013: [android_webview] Build test code against the shell APK. (Closed)

Created:
7 years, 9 months ago by mkosiba (inactive)
Modified:
7 years, 9 months ago
CC:
chromium-reviews, android-webview-reviews_chromium.org, Torne
Visibility:
Public.

Description

[android_webview] Build test code against the shell APK. This change is to fix resource-related issues with the current approach. We can't include resources in the test_java target to share them between the shell and test apks, so we need one apk to contain the shell and run tests against. To achieve this we apply the same trick as testshell does and build the test code against the .jar created as a side-effect of building the shell apk target. This change completely removes the test_apk target. BUG=None TEST=AndroidWebViewTests TBR=bulach@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190404

Patch Set 1 #

Patch Set 2 : move shell_apk to android_webview/test/shell #

Patch Set 3 : rebase after checking in binary files #

Patch Set 4 : update one test case #

Patch Set 5 : fix gyp error #

Patch Set 6 : #

Patch Set 7 : fix up minsdkversoin #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+120 lines, -1271 lines) Patch
M android_webview/android_webview.gyp View 1 2 1 chunk +0 lines, -24 lines 0 comments Download
M android_webview/android_webview_tests.gypi View 1 2 3 4 2 chunks +43 lines, -37 lines 0 comments Download
M android_webview/java/AndroidManifest.xml View 1 2 1 chunk +0 lines, -27 lines 0 comments Download
A + android_webview/javatests/AndroidManifest.xml View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
D android_webview/javatests/res/drawable/resource_icon.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D android_webview/javatests/res/raw/blank_html.html View 1 chunk +0 lines, -5 lines 0 comments Download
D android_webview/javatests/res/raw/resource_file.html View 1 chunk +0 lines, -8 lines 0 comments Download
D android_webview/javatests/res/raw/resource_icon.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D android_webview/javatests/res/values/strings.xml View 1 chunk +0 lines, -11 lines 0 comments Download
D android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerActivity.java View 1 chunk +0 lines, -62 lines 0 comments Download
M android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java View 1 chunk +2 lines, -1 line 0 comments Download
M android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java View 2 chunks +3 lines, -2 lines 0 comments Download
M android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java View 1 chunk +4 lines, -39 lines 0 comments Download
M android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java View 1 2 3 7 chunks +21 lines, -55 lines 0 comments Download
D android_webview/javatests/src/org/chromium/android_webview/test/AwTestContainerView.java View 1 chunk +0 lines, -159 lines 0 comments Download
D android_webview/javatests/src/org/chromium/android_webview/test/AwTestResourceProvider.java View 1 chunk +0 lines, -28 lines 0 comments Download
M android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java View 2 chunks +17 lines, -42 lines 0 comments Download
M android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java View 2 chunks +0 lines, -2 lines 0 comments Download
D android_webview/javatests/src/org/chromium/android_webview/test/NullContentsClient.java View 1 chunk +0 lines, -177 lines 0 comments Download
D android_webview/javatests/src/org/chromium/android_webview/test/TestContentProvider.java View 1 chunk +0 lines, -228 lines 0 comments Download
M android_webview/shell_apk/AndroidManifest.xml View 1 1 chunk +0 lines, -27 lines 0 comments Download
D android_webview/shell_apk/DEPS View 1 1 chunk +0 lines, -3 lines 0 comments Download
D android_webview/shell_apk/res/layout/testshell_activity.xml View 1 1 chunk +0 lines, -47 lines 0 comments Download
D android_webview/shell_apk/src/org/chromium/android_webview/shell/AndroidWebViewTestShellActivity.java View 1 chunk +0 lines, -162 lines 0 comments Download
D android_webview/shell_apk/src/org/chromium/android_webview/shell/AndroidWebViewTestShellApplication.java View 1 chunk +0 lines, -35 lines 0 comments Download
A android_webview/test/shell/AndroidManifest.xml View 1 2 3 4 5 6 1 chunk +35 lines, -0 lines 1 comment Download
A + android_webview/test/shell/DEPS View 1 0 chunks +-1 lines, --1 lines 0 comments Download
A + android_webview/test/shell/assets/asset_file.html View 1 0 chunks +-1 lines, --1 lines 0 comments Download
A + android_webview/test/shell/assets/full_screen_video_test.html View 1 0 chunks +-1 lines, --1 lines 0 comments Download
A + android_webview/test/shell/res/layout/testshell_activity.xml View 1 0 chunks +-1 lines, --1 lines 0 comments Download
A + android_webview/test/shell/res/raw/blank_html.html View 1 0 chunks +-1 lines, --1 lines 0 comments Download
A + android_webview/test/shell/res/raw/resource_file.html View 1 0 chunks +-1 lines, --1 lines 0 comments Download
A + android_webview/test/shell/res/values/strings.xml View 1 0 chunks +-1 lines, --1 lines 0 comments Download
A + android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java View 1 1 chunk +2 lines, -2 lines 0 comments Download
A + android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java View 1 2 chunks +2 lines, -3 lines 0 comments Download
A + android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java View 1 1 chunk +2 lines, -2 lines 0 comments Download
A + android_webview/test/shell/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerActivity.java View 1 0 chunks +-1 lines, --1 lines 0 comments Download
A + android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java View 1 0 chunks +-1 lines, --1 lines 0 comments Download
A + android_webview/test/shell/src/org/chromium/android_webview/test/NullContentsClient.java View 1 0 chunks +-1 lines, --1 lines 0 comments Download
A + android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java View 1 0 chunks +-1 lines, --1 lines 0 comments Download
D android_webview/test_apk/AndroidManifest.xml View 1 chunk +0 lines, -25 lines 0 comments Download
D android_webview/test_apk/DEPS View 1 chunk +0 lines, -3 lines 0 comments Download
D android_webview/test_apk/assets/asset_file.html View 1 chunk +0 lines, -8 lines 0 comments Download
D android_webview/test_apk/assets/asset_icon.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D android_webview/test_apk/assets/full_screen_video_test.html View 1 chunk +0 lines, -26 lines 0 comments Download
D android_webview/test_apk/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java View 1 chunk +0 lines, -33 lines 0 comments Download
M build/android/buildbot/bb_device_steps.py View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M build/landmines.py View 1 2 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 14 (0 generated)
mkosiba (inactive)
7 years, 9 months ago (2013-03-21 14:03:38 UTC) #1
mkosiba (inactive)
On 2013/03/21 14:03:38, Martin Kosiba wrote: The change looks scary, but here is what it ...
7 years, 9 months ago (2013-03-21 14:14:08 UTC) #2
newt (away)
lgtm at a high level, and the resources look like they'll work now.
7 years, 9 months ago (2013-03-21 18:42:28 UTC) #3
joth
lgtm I also didn't read in detail, but using same pattern as content shell and ...
7 years, 9 months ago (2013-03-22 02:19:24 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mkosiba@chromium.org/12609013/16001
7 years, 9 months ago (2013-03-22 16:17:30 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mkosiba@chromium.org/12609013/16001
7 years, 9 months ago (2013-03-22 18:24:22 UTC) #6
commit-bot: I haz the power
Sorry for I got bad news for ya. Compile failed with a clobber build on ...
7 years, 9 months ago (2013-03-22 20:57:57 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mkosiba@chromium.org/12609013/10051
7 years, 9 months ago (2013-03-23 12:48:39 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mkosiba@chromium.org/12609013/10051
7 years, 9 months ago (2013-03-23 15:05:58 UTC) #9
commit-bot: I haz the power
The commit queue went berserk retrying too often for a seemingly flaky test. Builder is ...
7 years, 9 months ago (2013-03-23 20:16:41 UTC) #10
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mkosiba@chromium.org/12609013/41001
7 years, 9 months ago (2013-03-25 10:49:08 UTC) #11
bulach
lgtm, thanks! one suggestion below, feel free to do as a follow up (if it ...
7 years, 9 months ago (2013-03-25 11:00:13 UTC) #12
mkosiba (inactive)
On 2013/03/25 11:00:13, bulach wrote: > lgtm, thanks! one suggestion below, feel free to do ...
7 years, 9 months ago (2013-03-25 11:09:20 UTC) #13
commit-bot: I haz the power
7 years, 9 months ago (2013-03-25 15:37:47 UTC) #14
Message was sent while issue was closed.
Change committed as 190404

Powered by Google App Engine
This is Rietveld 408576698