| Index: android_webview/android_webview_test_apk.isolate
|
| diff --git a/android_webview/android_webview_test_apk.isolate b/android_webview/android_webview_test_apk.isolate
|
| index 7436aca18b9764bac3e1afe50ef7dfd401fbf5fa..630854e4c7e41adf5c634e66b4c655ec01849765 100644
|
| --- a/android_webview/android_webview_test_apk.isolate
|
| +++ b/android_webview/android_webview_test_apk.isolate
|
| @@ -1,14 +1,28 @@
|
| -# Copyright (c) 2014 The Chromium Authors. All rights reserved.
|
| +# Copyright 2015 The Chromium Authors. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
| {
|
| - 'conditions': [
|
| - ['OS=="android"', {
|
| - 'variables': {
|
| - 'files': [
|
| - '<(DEPTH)/android_webview/test/data/',
|
| - ],
|
| - },
|
| - }],
|
| + 'includes': [
|
| + '../build/android/android.isolate',
|
| ],
|
| + 'variables': {
|
| + 'command': [
|
| + '<(PRODUCT_DIR)/bin/run_android_webview_test_apk',
|
| + '--enable-platform-mode',
|
| + '-e', 'local',
|
| + '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
|
| + ],
|
| + 'files': [
|
| + '../third_party/proguard/lib/proguard.jar',
|
| + '<(PRODUCT_DIR)/host_forwarder',
|
| + '<(PRODUCT_DIR)/forwarder_dist/',
|
| + '<(PRODUCT_DIR)/android_webview_test_apk/',
|
| + '<(PRODUCT_DIR)/apks/AndroidWebView.apk',
|
| + '<(PRODUCT_DIR)/apks/AndroidWebViewTest.apk',
|
| + '<(PRODUCT_DIR)/bin/run_android_webview_test_apk',
|
| + '<(PRODUCT_DIR)/test.lib.java/AndroidWebViewTest.jar',
|
| + 'android_webview_test_data.isolate',
|
| + 'test/data/',
|
| + ]
|
| + },
|
| }
|
|
|