Commit 732db3a1 authored by agrieve's avatar agrieve Committed by Commit bot

Fix net_unittests on Android swarming by adding testserver as a data_dep

TBR=phajdan.jr
BUG=589318

Review URL: https://codereview.chromium.org/1914073002

Cr-Commit-Position: refs/heads/master@{#389844}
parent 18a6b28c
...@@ -317,6 +317,7 @@ _VALID_OS_MACROS = ( ...@@ -317,6 +317,7 @@ _VALID_OS_MACROS = (
_ANDROID_SPECIFIC_PYDEPS_FILES = [ _ANDROID_SPECIFIC_PYDEPS_FILES = [
'build/android/test_runner.pydeps', 'build/android/test_runner.pydeps',
'net/tools/testserver/testserver.pydeps',
] ]
_GENERIC_PYDEPS_FILES = [ _GENERIC_PYDEPS_FILES = [
......
...@@ -1594,6 +1594,7 @@ test("net_unittests") { ...@@ -1594,6 +1594,7 @@ test("net_unittests") {
} }
if (is_android) { if (is_android) {
data_deps += [ "//net/tools/testserver:testserver_py" ]
deps += [ deps += [
":net_test_jni_headers", ":net_test_jni_headers",
"//base:base_java_unittest_support", "//base:base_java_unittest_support",
......
# 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.
group("testserver_py") {
_py_files = read_file("testserver.pydeps", "list lines")
# Filter out comments.
set_sources_assignment_filter([ "#*" ])
sources = _py_files
data = sources
}
# Generated by running:
# build/print_python_deps.py --root net/tools/testserver --output net/tools/testserver/testserver.pydeps net/tools/testserver/testserver.py
../../../third_party/pyftpdlib/src/pyftpdlib/__init__.py
../../../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py
../../../third_party/pywebsocket/src/mod_pywebsocket/__init__.py
../../../third_party/pywebsocket/src/mod_pywebsocket/_stream_base.py
../../../third_party/pywebsocket/src/mod_pywebsocket/_stream_hixie75.py
../../../third_party/pywebsocket/src/mod_pywebsocket/_stream_hybi.py
../../../third_party/pywebsocket/src/mod_pywebsocket/common.py
../../../third_party/pywebsocket/src/mod_pywebsocket/dispatch.py
../../../third_party/pywebsocket/src/mod_pywebsocket/extensions.py
../../../third_party/pywebsocket/src/mod_pywebsocket/handshake/__init__.py
../../../third_party/pywebsocket/src/mod_pywebsocket/handshake/_base.py
../../../third_party/pywebsocket/src/mod_pywebsocket/handshake/hybi.py
../../../third_party/pywebsocket/src/mod_pywebsocket/handshake/hybi00.py
../../../third_party/pywebsocket/src/mod_pywebsocket/http_header_util.py
../../../third_party/pywebsocket/src/mod_pywebsocket/memorizingfile.py
../../../third_party/pywebsocket/src/mod_pywebsocket/msgutil.py
../../../third_party/pywebsocket/src/mod_pywebsocket/mux.py
../../../third_party/pywebsocket/src/mod_pywebsocket/standalone.py
../../../third_party/pywebsocket/src/mod_pywebsocket/stream.py
../../../third_party/pywebsocket/src/mod_pywebsocket/util.py
../../../third_party/pywebsocket/src/mod_pywebsocket/xhr_benchmark_handler.py
../../../third_party/tlslite/tlslite/__init__.py
../../../third_party/tlslite/tlslite/api.py
../../../third_party/tlslite/tlslite/basedb.py
../../../third_party/tlslite/tlslite/checker.py
../../../third_party/tlslite/tlslite/constants.py
../../../third_party/tlslite/tlslite/errors.py
../../../third_party/tlslite/tlslite/handshakesettings.py
../../../third_party/tlslite/tlslite/integration/__init__.py
../../../third_party/tlslite/tlslite/integration/asyncstatemachine.py
../../../third_party/tlslite/tlslite/integration/clienthelper.py
../../../third_party/tlslite/tlslite/integration/httptlsconnection.py
../../../third_party/tlslite/tlslite/integration/imap4_tls.py
../../../third_party/tlslite/tlslite/integration/pop3_tls.py
../../../third_party/tlslite/tlslite/integration/smtp_tls.py
../../../third_party/tlslite/tlslite/integration/tlsasyncdispatchermixin.py
../../../third_party/tlslite/tlslite/integration/tlssocketservermixin.py
../../../third_party/tlslite/tlslite/integration/xmlrpcserver.py
../../../third_party/tlslite/tlslite/integration/xmlrpctransport.py
../../../third_party/tlslite/tlslite/mathtls.py
../../../third_party/tlslite/tlslite/messages.py
../../../third_party/tlslite/tlslite/session.py
../../../third_party/tlslite/tlslite/sessioncache.py
../../../third_party/tlslite/tlslite/tlsconnection.py
../../../third_party/tlslite/tlslite/tlsrecordlayer.py
../../../third_party/tlslite/tlslite/utils/__init__.py
../../../third_party/tlslite/tlslite/utils/aes.py
../../../third_party/tlslite/tlslite/utils/aesgcm.py
../../../third_party/tlslite/tlslite/utils/asn1parser.py
../../../third_party/tlslite/tlslite/utils/cipherfactory.py
../../../third_party/tlslite/tlslite/utils/codec.py
../../../third_party/tlslite/tlslite/utils/compat.py
../../../third_party/tlslite/tlslite/utils/cryptomath.py
../../../third_party/tlslite/tlslite/utils/keyfactory.py
../../../third_party/tlslite/tlslite/utils/openssl_aes.py
../../../third_party/tlslite/tlslite/utils/openssl_rc4.py
../../../third_party/tlslite/tlslite/utils/openssl_rsakey.py
../../../third_party/tlslite/tlslite/utils/openssl_tripledes.py
../../../third_party/tlslite/tlslite/utils/p256.py
../../../third_party/tlslite/tlslite/utils/pem.py
../../../third_party/tlslite/tlslite/utils/pycrypto_aes.py
../../../third_party/tlslite/tlslite/utils/pycrypto_aesgcm.py
../../../third_party/tlslite/tlslite/utils/pycrypto_rc4.py
../../../third_party/tlslite/tlslite/utils/pycrypto_rsakey.py
../../../third_party/tlslite/tlslite/utils/pycrypto_tripledes.py
../../../third_party/tlslite/tlslite/utils/python_aes.py
../../../third_party/tlslite/tlslite/utils/python_aesgcm.py
../../../third_party/tlslite/tlslite/utils/python_rc4.py
../../../third_party/tlslite/tlslite/utils/python_rsakey.py
../../../third_party/tlslite/tlslite/utils/rc4.py
../../../third_party/tlslite/tlslite/utils/rijndael.py
../../../third_party/tlslite/tlslite/utils/rsakey.py
../../../third_party/tlslite/tlslite/utils/tackwrapper.py
../../../third_party/tlslite/tlslite/utils/tripledes.py
../../../third_party/tlslite/tlslite/verifierdb.py
../../../third_party/tlslite/tlslite/x509.py
../../../third_party/tlslite/tlslite/x509certchain.py
asn1.py
echo_message.py
minica.py
testserver.py
testserver_base.py
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment