diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 13:08:15 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 13:08:15 +0000 |
| commit | 8df601213f42259a0aae9d2e040f0740b2c17945 (patch) | |
| tree | 61d839fd92885daa0c30433e5b4e0afb3a211f20 /android_webview | |
| parent | aaeeeb997f67e490de0dba4a555bac47e11bfadf (diff) | |
| download | chromium_src-8df601213f42259a0aae9d2e040f0740b2c17945.zip chromium_src-8df601213f42259a0aae9d2e040f0740b2c17945.tar.gz chromium_src-8df601213f42259a0aae9d2e040f0740b2c17945.tar.bz2 | |
[Android] Fix AwSettingsTest tests downstream failures due to missing resource files
A whitespace change to a java file is made to ensure that apk will be rebuilt.
R=mkosiba@chromium.org
Review URL: https://codereview.chromium.org/11030015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159684 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/android_webview.gyp | 8 | ||||
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 695e93e..461365b 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -177,8 +177,14 @@ 'package_name': 'android_webview_test', 'apk_name': 'AndroidWebViewTest', 'java_in_dir': '../android_webview/javatests', - 'resource_dir': '../res', + 'resource_dir': 'res', }, + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/android_webview_test/assets', + 'files': [ '<!@(find <(java_in_dir)/assets -type f -name "*")' ] + }, + ], 'includes': [ '../build/java_apk.gypi' ], }, ], diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java index d3bf304..6f0f379 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java @@ -31,7 +31,7 @@ import java.util.List; /** * A test suite for ContentSettings class. The key objective is to verify that each * settings applies either to each individual view or to all views of the - * application. + * application */ public class AwSettingsTest extends AndroidWebViewTestBase { private static final long TEST_TIMEOUT = 20000L; |