diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 15:37:45 +0000 |
|---|---|---|
| committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 15:37:45 +0000 |
| commit | 8c56afd1dc94d4877110ab7adc136ab69d466467 (patch) | |
| tree | 898eeaaa1f62884011cd6208a7a0257fdb19e1ef /build/android/buildbot | |
| parent | 4acc18b555e36d72ac556f5b96735059b23a2650 (diff) | |
| download | chromium_src-8c56afd1dc94d4877110ab7adc136ab69d466467.zip chromium_src-8c56afd1dc94d4877110ab7adc136ab69d466467.tar.gz chromium_src-8c56afd1dc94d4877110ab7adc136ab69d466467.tar.bz2 | |
[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
Review URL: https://chromiumcodereview.appspot.com/12609013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/buildbot')
| -rwxr-xr-x | build/android/buildbot/bb_device_steps.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py index 440c2eb..0f2afc6 100755 --- a/build/android/buildbot/bb_device_steps.py +++ b/build/android/buildbot/bb_device_steps.py @@ -53,7 +53,7 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [ constants.CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR), I_TEST('AndroidWebView', 'AndroidWebView.apk', - 'org.chromium.android_webview', + 'org.chromium.android_webview.shell', 'AndroidWebViewTest', 'webview:android_webview/test/data/device_files', None), |