diff --git a/audio/BUILD.gn b/audio/BUILD.gn index 64416a2c74..739016e9be 100644 --- a/audio/BUILD.gn +++ b/audio/BUILD.gn @@ -215,18 +215,16 @@ if (rtc_include_tests) { group("low_bandwidth_audio_perf_test") { testonly = true - deps = [ - ":low_bandwidth_audio_test", - "//third_party/catapult/tracing/tracing/proto:histogram_proto", - ] + deps = [ ":low_bandwidth_audio_test" ] data = [ "test/low_bandwidth_audio_test.py", "../resources/voice_engine/audio_tiny16.wav", "../resources/voice_engine/audio_tiny48.wav", - "${root_out_dir}/pyproto/tracing/tracing/proto/histogram_pb2.py", - "//third_party/protobuf:py_proto_runtime", ] + deps += [ "//third_party/catapult/tracing/tracing/proto:histogram_proto" ] + data += + [ "${root_out_dir}/pyproto/tracing/tracing/proto/histogram_pb2.py" ] # TODO(http://crbug.com/1029452): Create a cleaner target with just the # tracing python code. We don't need Polymer for instance. diff --git a/audio/test/low_bandwidth_audio_test.py b/audio/test/low_bandwidth_audio_test.py index 4e219691e2..c995cd6547 100755 --- a/audio/test/low_bandwidth_audio_test.py +++ b/audio/test/low_bandwidth_audio_test.py @@ -234,10 +234,8 @@ def _ConfigurePythonPath(args): sys.path.insert(0, histogram_proto_path) # Fail early in case the proto hasn't been built. - try: - import histogram_pb2 - except ImportError as e: - logging.exception(e) + from tracing.proto import histogram_proto + if not histogram_proto.HAS_PROTO: raise ImportError('Could not find histogram_pb2. You need to build the ' 'low_bandwidth_audio_perf_test target before invoking ' 'this script. Expected to find ' @@ -247,7 +245,6 @@ def _ConfigurePythonPath(args): def main(): # pylint: disable=W0101 logging.basicConfig(level=logging.INFO) - logging.info('Invoked with %s', str(sys.argv)) args = _ParseArgs()