diff options
| author | jbudorick <jbudorick@chromium.org> | 2016-03-24 20:07:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 03:09:41 +0000 |
| commit | e18e7a6d2e1971e9b50b0ca3fe1fc9f17b264193 (patch) | |
| tree | ea5e8e4d19c8b4b7a9d59a5aa4cac02650443d36 /components | |
| parent | 5cc29a417bcb7b86ca8ebc4304eefa4d74a7e919 (diff) | |
| download | chromium_src-e18e7a6d2e1971e9b50b0ca3fe1fc9f17b264193.zip chromium_src-e18e7a6d2e1971e9b50b0ca3fe1fc9f17b264193.tar.gz chromium_src-e18e7a6d2e1971e9b50b0ca3fe1fc9f17b264193.tar.bz2 | |
[cronet] Add an isolate file for cronet_test_instrumentation_apk.
These files are used by QuicTestServer & PkpTest. They're currently handled
as a special case in //build/android/pylib/instrumentation/setup.py that I'd
like to get rid of.
BUG=
Review URL: https://codereview.chromium.org/1826313003
Cr-Commit-Position: refs/heads/master@{#383232}
Diffstat (limited to 'components')
| -rw-r--r-- | components/cronet.gypi | 7 | ||||
| -rw-r--r-- | components/cronet/android/BUILD.gn | 10 | ||||
| -rw-r--r-- | components/cronet/android/cronet_test_instrumentation_apk.isolate | 18 |
3 files changed, 34 insertions, 1 deletions
diff --git a/components/cronet.gypi b/components/cronet.gypi index 0b64e65..7f433a2 100644 --- a/components/cronet.gypi +++ b/components/cronet.gypi @@ -508,11 +508,16 @@ 'resource_dir': 'cronet/android/test/res', 'is_test_apk': 1, 'run_findbugs': 1, + 'test_type': 'instrumentation', + 'isolate_file': 'cronet/android/cronet_test_instrumentation_apk.isolate', 'additional_apks': [ '<(PRODUCT_DIR)/apks/ChromiumNetTestSupport.apk', ], }, - 'includes': [ '../build/java_apk.gypi' ], + 'includes': [ + '../build/java_apk.gypi', + '../build/android/test_runner.gypi', + ], }, { 'target_name': 'cronet_perf_test_apk', diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn index 7e0b863..8908810 100644 --- a/components/cronet/android/BUILD.gn +++ b/components/cronet/android/BUILD.gn @@ -629,6 +629,16 @@ instrumentation_test_apk("cronet_test_instrumentation_apk") { ] additional_apks = [ "//net/android:net_test_support_apk" ] + data = [ + "//net/data/ssl/certificates/quic_test.example.com.crt", + "//net/data/ssl/certificates/quic_test.example.com.key", + "//net/data/ssl/certificates/quic_test.example.com.key.pkcs8", + "//net/data/ssl/certificates/quic_test.example.com.key.sct", + ] + + # TODO(jbudorick): Remove this once GN uses the generated .isolate files. + isolate_file = "cronet_test_instrumentation_apk.isolate" + run_findbugs = true } diff --git a/components/cronet/android/cronet_test_instrumentation_apk.isolate b/components/cronet/android/cronet_test_instrumentation_apk.isolate new file mode 100644 index 0000000..be10039 --- /dev/null +++ b/components/cronet/android/cronet_test_instrumentation_apk.isolate @@ -0,0 +1,18 @@ +# Copyright 2016 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)/net/data/ssl/certificates/quic_test.example.com.crt', + '<(DEPTH)/net/data/ssl/certificates/quic_test.example.com.key', + '<(DEPTH)/net/data/ssl/certificates/quic_test.example.com.key.pkcs8', + '<(DEPTH)/net/data/ssl/certificates/quic_test.example.com.key.sct', + ], + }, + }], + ], +} |