| Index: content/content_shell_test_apk.isolate
|
| diff --git a/content/content_shell_test_apk.isolate b/content/content_shell_test_apk.isolate
|
| index 6f27c350f582d0d5766a279310c5cc752b4a7856..67bc6934d6cd2ab7acf3479c9e83f8ea083a3fcd 100644
|
| --- a/content/content_shell_test_apk.isolate
|
| +++ b/content/content_shell_test_apk.isolate
|
| @@ -1,21 +1,25 @@
|
| -# 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)/content/test/data/android/',
|
| - '<(DEPTH)/content/test/data/media/session/',
|
| - '<(DEPTH)/net/data/ssl/certificates/crit-codeSigning-chain.pem',
|
| - '<(DEPTH)/net/data/ssl/certificates/eku-test-root.pem',
|
| - '<(DEPTH)/net/data/ssl/certificates/invalid_key_usage_cert.der',
|
| - '<(DEPTH)/net/data/ssl/certificates/non-crit-codeSigning-chain.pem',
|
| - '<(DEPTH)/net/data/ssl/certificates/ok_cert.pem',
|
| - '<(DEPTH)/net/data/ssl/certificates/root_ca_cert.pem',
|
| - ],
|
| - },
|
| - }],
|
| + 'includes': [
|
| + '../build/android/android.isolate',
|
| + 'content_shell_test_data.isolate',
|
| ],
|
| + 'variables': {
|
| + 'command': [
|
| + '<(PRODUCT_DIR)/bin/run_content_shell_test_apk',
|
| + '--enable-platform-mode',
|
| + '-e', 'local',
|
| + '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
|
| + ],
|
| + 'files': [
|
| + '../third_party/proguard/',
|
| + '<(PRODUCT_DIR)/apks/ContentShell.apk',
|
| + '<(PRODUCT_DIR)/apks/ContentShellTest.apk',
|
| + '<(PRODUCT_DIR)/bin/run_content_shell_test_apk',
|
| + '<(PRODUCT_DIR)/test.lib.java/ContentShellTest.jar',
|
| + 'content_shell_test_data.isolate',
|
| + ]
|
| + },
|
| }
|
|
|