diff options
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; |