Skip to content

GitLab

T
tangled
Commit 487c4903 authored by John Budorick's avatar John Budorick Committed by Commit Bot
Browse files
Options

android: move most avd logic into build/android/. 

Makes handling the avd code significantly easier for build subtree
embedders.

This is a follow-up to crrev.com/c/1827248

Bug: 922145
Change-Id: I30957c13e99c7224dddfd201666af622ba855441
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841935
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703011}
parent d6f52fd9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 730 additions and 751 deletions
PRESUBMIT.py
View file @ 487c4903
...@@ -1357,7 +1357,6 @@ _ANDROID_SPECIFIC_PYDEPS_FILES = [ ...@@ -1357,7 +1357,6 @@ _ANDROID_SPECIFIC_PYDEPS_FILES = [
'net/tools/testserver/testserver.pydeps', 'net/tools/testserver/testserver.pydeps',
'testing/scripts/run_android_wpt.pydeps', 'testing/scripts/run_android_wpt.pydeps',
'third_party/android_platform/development/scripts/stack.pydeps', 'third_party/android_platform/development/scripts/stack.pydeps',
'tools/android/avd/avd.pydeps',
] ]
......
build/android/BUILD.gn
View file @ 487c4903
...@@ -93,15 +93,11 @@ python_library("test_runner_py") { ...@@ -93,15 +93,11 @@ python_library("test_runner_py") {
data += [ data += [
"//third_party/android_build_tools/bundletool/bundletool-all-0.10.3.jar", "//third_party/android_build_tools/bundletool/bundletool-all-0.10.3.jar",
] ]
data_deps += [ data_deps +=
"//third_party/android_platform/development/scripts:stack_py", [ "//third_party/android_platform/development/scripts:stack_py" ]
"//tools/android/avd:avd_py",
]
if (is_asan) { if (is_asan) {
data_deps += [ "//tools/android/asan/third_party:asan_device_setup" ] data_deps += [ "//tools/android/asan/third_party:asan_device_setup" ]
} }
} else {
pydeps_sources_assignment_filters = [ "../../tools/android/*" ]
} }
# Proguard is needed only when using apks (rather than native executables). # Proguard is needed only when using apks (rather than native executables).
......
build/android/PRESUBMIT.py
View file @ 487c4903
...@@ -10,8 +10,6 @@ details on the presubmit API built into depot_tools. ...@@ -10,8 +10,6 @@ details on the presubmit API built into depot_tools.
def CommonChecks(input_api, output_api): def CommonChecks(input_api, output_api):
output = []
build_android_dir = input_api.PresubmitLocalPath() build_android_dir = input_api.PresubmitLocalPath()
def J(*dirs): def J(*dirs):
...@@ -19,32 +17,38 @@ def CommonChecks(input_api, output_api): ...@@ -19,32 +17,38 @@ def CommonChecks(input_api, output_api):
return input_api.os_path.join(build_android_dir, *dirs) return input_api.os_path.join(build_android_dir, *dirs)
build_pys = [ build_pys = [
r'gn/.*\.py$',
r'gyp/.*\.py$', r'gyp/.*\.py$',
r'gn/.*\.py',
] ]
output.extend(input_api.canned_checks.RunPylint( tests = []
input_api, tests.extend(
output_api, input_api.canned_checks.GetPylint(
pylintrc='pylintrc', input_api,
black_list=build_pys, output_api,
extra_paths_list=[ pylintrc='pylintrc',
J(), black_list=[
J('gyp'), r'.*_pb2\.py',
J('buildbot'), ] + build_pys,
J('..', 'util', 'lib', 'common'), extra_paths_list=[
J('..', '..', 'third_party', 'catapult', 'common', 'py_trace_event'), J(),
J('..', '..', 'third_party', 'catapult', 'common', 'py_utils'), J('gyp'),
J('..', '..', 'third_party', 'catapult', 'devil'), J('buildbot'),
J('..', '..', 'third_party', 'catapult', 'tracing'), J('..', 'util', 'lib', 'common'),
J('..', '..', 'third_party', 'depot_tools'), J('..', '..', 'third_party', 'catapult', 'common',
J('..', '..', 'third_party', 'colorama', 'src'), 'py_trace_event'),
J('..', '..', 'third_party', 'pymock'), J('..', '..', 'third_party', 'catapult', 'common', 'py_utils'),
])) J('..', '..', 'third_party', 'catapult', 'devil'),
output.extend(input_api.canned_checks.RunPylint( J('..', '..', 'third_party', 'catapult', 'tracing'),
input_api, J('..', '..', 'third_party', 'depot_tools'),
output_api, J('..', '..', 'third_party', 'colorama', 'src'),
white_list=build_pys, J('..', '..', 'third_party', 'pymock'),
extra_paths_list=[J('gyp'), J('gn')])) ]))
tests.extend(
input_api.canned_checks.GetPylint(
input_api,
output_api,
white_list=build_pys,
extra_paths_list=[J('gyp'), J('gn')]))
# Disabled due to http://crbug.com/410936 # Disabled due to http://crbug.com/410936
#output.extend(input_api.canned_checks.RunUnitTestsInDirectory( #output.extend(input_api.canned_checks.RunUnitTestsInDirectory(
...@@ -55,8 +59,8 @@ def CommonChecks(input_api, output_api): ...@@ -55,8 +59,8 @@ def CommonChecks(input_api, output_api):
'PYTHONPATH': build_android_dir, 'PYTHONPATH': build_android_dir,
'PYTHONDONTWRITEBYTECODE': '1', 'PYTHONDONTWRITEBYTECODE': '1',
}) })
output.extend( tests.extend(
input_api.canned_checks.RunUnitTests( input_api.canned_checks.GetUnitTests(
input_api, input_api,
output_api, output_api,
unit_tests=[ unit_tests=[
...@@ -88,7 +92,7 @@ def CommonChecks(input_api, output_api): ...@@ -88,7 +92,7 @@ def CommonChecks(input_api, output_api):
], ],
env=pylib_test_env)) env=pylib_test_env))
return output return input_api.RunTests(tests)
def CheckChangeOnUpload(input_api, output_api): def CheckChangeOnUpload(input_api, output_api):
......
build/android/pylib/local/emulator/avd.py 0 → 100644
View file @ 487c4903
This diff is collapsed.
build/android/pylib/local/emulator/local_emulator_environment.py
View file @ 487c4903
...@@ -3,17 +3,10 @@ ...@@ -3,17 +3,10 @@
# found in the LICENSE file. # found in the LICENSE file.
import logging import logging
import os
from devil.utils import parallelizer from devil.utils import parallelizer
from pylib.constants import host_paths
from pylib.local.device import local_device_environment from pylib.local.device import local_device_environment
from pylib.local.emulator import avd
AVD_DIR_PATH = os.path.join(host_paths.DIR_SOURCE_ROOT, 'tools', 'android',
'avd')
with host_paths.SysPath(AVD_DIR_PATH):
import avd # pylint: disable=import-error
# Mirroring https://bit.ly/2OjuxcS#23 # Mirroring https://bit.ly/2OjuxcS#23
_MAX_ANDROID_EMULATORS = 16 _MAX_ANDROID_EMULATORS = 16
......
build/android/pylib/local/emulator/proto/avd_pb2.py 0 → 100644
View file @ 487c4903
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: avd.proto
import sys
_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode('latin1'))
from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf import descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
DESCRIPTOR = _descriptor.FileDescriptor(
name='avd.proto',
package='tools.android.avd.proto',
syntax='proto3',
serialized_pb=_b(
'\n\tavd.proto\x12\x17tools.android.avd.proto\"G\n\x0b\x43IPDPackage\x12\x14\n\x0cpackage_name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\x12\x11\n\tdest_path\x18\x03 \x01(\t\"\xf1\x01\n\x03\x41vd\x12>\n\x10\x65mulator_package\x18\x01 \x01(\x0b\x32$.tools.android.avd.proto.CIPDPackage\x12\x42\n\x14system_image_package\x18\x02 \x01(\x0b\x32$.tools.android.avd.proto.CIPDPackage\x12\x19\n\x11system_image_name\x18\x03 \x01(\t\x12\x39\n\x0b\x61vd_package\x18\x04 \x01(\x0b\x32$.tools.android.avd.proto.CIPDPackage\x12\x10\n\x08\x61vd_name\x18\x05 \x01(\tb\x06proto3'
))
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
_CIPDPACKAGE = _descriptor.Descriptor(
name='CIPDPackage',
full_name='tools.android.avd.proto.CIPDPackage',
filename=None,
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(
name='package_name',
full_name='tools.android.avd.proto.CIPDPackage.package_name',
index=0,
number=1,
type=9,
cpp_type=9,
label=1,
has_default_value=False,
default_value=_b("").decode('utf-8'),
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='version',
full_name='tools.android.avd.proto.CIPDPackage.version',
index=1,
number=2,
type=9,
cpp_type=9,
label=1,
has_default_value=False,
default_value=_b("").decode('utf-8'),
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='dest_path',
full_name='tools.android.avd.proto.CIPDPackage.dest_path',
index=2,
number=3,
type=9,
cpp_type=9,
label=1,
has_default_value=False,
default_value=_b("").decode('utf-8'),
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
],
extensions=[],
nested_types=[],
enum_types=[],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[],
serialized_start=38,
serialized_end=109,
)
_AVD = _descriptor.Descriptor(
name='Avd',
full_name='tools.android.avd.proto.Avd',
filename=None,
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(
name='emulator_package',
full_name='tools.android.avd.proto.Avd.emulator_package',
index=0,
number=1,
type=11,
cpp_type=10,
label=1,
has_default_value=False,
default_value=None,
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='system_image_package',
full_name='tools.android.avd.proto.Avd.system_image_package',
index=1,
number=2,
type=11,
cpp_type=10,
label=1,
has_default_value=False,
default_value=None,
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='system_image_name',
full_name='tools.android.avd.proto.Avd.system_image_name',
index=2,
number=3,
type=9,
cpp_type=9,
label=1,
has_default_value=False,
default_value=_b("").decode('utf-8'),
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='avd_package',
full_name='tools.android.avd.proto.Avd.avd_package',
index=3,
number=4,
type=11,
cpp_type=10,
label=1,
has_default_value=False,
default_value=None,
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='avd_name',
full_name='tools.android.avd.proto.Avd.avd_name',
index=4,
number=5,
type=9,
cpp_type=9,
label=1,
has_default_value=False,
default_value=_b("").decode('utf-8'),
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
],
extensions=[],
nested_types=[],
enum_types=[],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[],
serialized_start=112,
serialized_end=353,
)
_AVD.fields_by_name['emulator_package'].message_type = _CIPDPACKAGE
_AVD.fields_by_name['system_image_package'].message_type = _CIPDPACKAGE
_AVD.fields_by_name['avd_package'].message_type = _CIPDPACKAGE
DESCRIPTOR.message_types_by_name['CIPDPackage'] = _CIPDPACKAGE
DESCRIPTOR.message_types_by_name['Avd'] = _AVD
CIPDPackage = _reflection.GeneratedProtocolMessageType(
'CIPDPackage',
(_message.Message, ),
dict(
DESCRIPTOR=_CIPDPACKAGE,
__module__='avd_pb2'
# @@protoc_insertion_point(class_scope:tools.android.avd.proto.CIPDPackage)
))
_sym_db.RegisterMessage(CIPDPackage)
Avd = _reflection.GeneratedProtocolMessageType(
'Avd',
(_message.Message, ),
dict(
DESCRIPTOR=_AVD,
__module__='avd_pb2'
# @@protoc_insertion_point(class_scope:tools.android.avd.proto.Avd)
))
_sym_db.RegisterMessage(Avd)
# @@protoc_insertion_point(module_scope)
build/android/test_runner.pydeps
View file @ 487c4903
...@@ -118,9 +118,6 @@ ...@@ -118,9 +118,6 @@
../../third_party/markupsafe/__init__.py ../../third_party/markupsafe/__init__.py
../../third_party/markupsafe/_compat.py ../../third_party/markupsafe/_compat.py
../../third_party/markupsafe/_native.py ../../third_party/markupsafe/_native.py
../../tools/android/avd/avd.py
../../tools/android/avd/proto/__init__.py
../../tools/android/avd/proto/avd_pb2.py
../../tools/swarming_client/libs/__init__.py ../../tools/swarming_client/libs/__init__.py
../../tools/swarming_client/libs/logdog/__init__.py ../../tools/swarming_client/libs/logdog/__init__.py
../../tools/swarming_client/libs/logdog/bootstrap.py ../../tools/swarming_client/libs/logdog/bootstrap.py
...@@ -172,7 +169,10 @@ pylib/local/device/local_device_linker_test_run.py ...@@ -172,7 +169,10 @@ pylib/local/device/local_device_linker_test_run.py
pylib/local/device/local_device_monkey_test_run.py pylib/local/device/local_device_monkey_test_run.py
pylib/local/device/local_device_test_run.py pylib/local/device/local_device_test_run.py
pylib/local/emulator/__init__.py pylib/local/emulator/__init__.py
pylib/local/emulator/avd.py
pylib/local/emulator/local_emulator_environment.py pylib/local/emulator/local_emulator_environment.py
pylib/local/emulator/proto/__init__.py
pylib/local/emulator/proto/avd_pb2.py
pylib/local/local_test_server_spawner.py pylib/local/local_test_server_spawner.py
pylib/local/machine/__init__.py pylib/local/machine/__init__.py
pylib/local/machine/local_machine_environment.py pylib/local/machine/local_machine_environment.py
......
build/config/python.gni
View file @ 487c4903
...@@ -22,9 +22,6 @@ ...@@ -22,9 +22,6 @@
# #
# Variables # Variables
# pydeps_file: Path to .pydeps file to read sources from (optional). # pydeps_file: Path to .pydeps file to read sources from (optional).
# pydeps_sources_assignment_filters: Additional sources_assignment_filters to
# use when reading the contents of the pydeps file. Unused if pydeps_file
# isn't set. (optional)
# data: Additional files to include in data. E.g. non-.py files needed by the # data: Additional files to include in data. E.g. non-.py files needed by the
# library, or .py files that are conditionally / lazily imported. # library, or .py files that are conditionally / lazily imported.
# #
...@@ -47,12 +44,7 @@ template("python_library") { ...@@ -47,12 +44,7 @@ template("python_library") {
_py_files = read_file(invoker.pydeps_file, "list lines") _py_files = read_file(invoker.pydeps_file, "list lines")
# Filter out comments. # Filter out comments.
pydeps_sources_assignment_filters = [ "#*" ] set_sources_assignment_filter([ "#*" ])
if (defined(invoker.pydeps_sources_assignment_filters)) {
pydeps_sources_assignment_filters +=
invoker.pydeps_sources_assignment_filters
}
set_sources_assignment_filter(pydeps_sources_assignment_filters)
sources = _py_files sources = _py_files
# Dependencies are listed relative to the pydeps file directory, but data # Dependencies are listed relative to the pydeps file directory, but data
......
tools/android/avd/BUILD.gn deleted 100644 → 0
View file @ d6f52fd9
# Copyright 2019 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.
import("//build/config/python.gni")
python_library("avd_py") {
testonly = true
pydeps_file = "avd.pydeps"
data = [
"proto/",
]
}
tools/android/avd/avd.py
View file @ 487c4903
This diff is collapsed.
tools/android/avd/avd.pydeps deleted 100644 → 0
View file @ d6f52fd9
# Generated by running:
# build/print_python_deps.py --root tools/android/avd --output tools/android/avd/avd.pydeps tools/android/avd/avd.py
../../../build/android/devil_chromium.py
../../../build/android/pylib/__init__.py
../../../build/android/pylib/constants/__init__.py
../../../build/android/pylib/constants/host_paths.py
../../../third_party/catapult/common/py_utils/py_utils/__init__.py
../../../third_party/catapult/common/py_utils/py_utils/cloud_storage.py
../../../third_party/catapult/common/py_utils/py_utils/cloud_storage_global_lock.py
../../../third_party/catapult/common/py_utils/py_utils/lock.py
../../../third_party/catapult/common/py_utils/py_utils/tempfile_ext.py
../../../third_party/catapult/dependency_manager/dependency_manager/__init__.py
../../../third_party/catapult/dependency_manager/dependency_manager/archive_info.py
../../../third_party/catapult/dependency_manager/dependency_manager/base_config.py
../../../third_party/catapult/dependency_manager/dependency_manager/cloud_storage_info.py
../../../third_party/catapult/dependency_manager/dependency_manager/dependency_info.py
../../../third_party/catapult/dependency_manager/dependency_manager/dependency_manager_util.py
../../../third_party/catapult/dependency_manager/dependency_manager/exceptions.py
../../../third_party/catapult/dependency_manager/dependency_manager/local_path_info.py
../../../third_party/catapult/dependency_manager/dependency_manager/manager.py
../../../third_party/catapult/dependency_manager/dependency_manager/uploader.py
../../../third_party/catapult/devil/devil/__init__.py
../../../third_party/catapult/devil/devil/android/__init__.py
../../../third_party/catapult/devil/devil/android/apk_helper.py
../../../third_party/catapult/devil/devil/android/constants/__init__.py
../../../third_party/catapult/devil/devil/android/constants/chrome.py
../../../third_party/catapult/devil/devil/android/constants/file_system.py
../../../third_party/catapult/devil/devil/android/decorators.py
../../../third_party/catapult/devil/devil/android/device_blacklist.py
../../../third_party/catapult/devil/devil/android/device_errors.py
../../../third_party/catapult/devil/devil/android/device_signal.py
../../../third_party/catapult/devil/devil/android/device_temp_file.py
../../../third_party/catapult/devil/devil/android/device_utils.py
../../../third_party/catapult/devil/devil/android/install_commands.py
../../../third_party/catapult/devil/devil/android/logcat_monitor.py
../../../third_party/catapult/devil/devil/android/md5sum.py
../../../third_party/catapult/devil/devil/android/ndk/__init__.py
../../../third_party/catapult/devil/devil/android/ndk/abis.py
../../../third_party/catapult/devil/devil/android/sdk/__init__.py
../../../third_party/catapult/devil/devil/android/sdk/aapt.py
../../../third_party/catapult/devil/devil/android/sdk/adb_wrapper.py
../../../third_party/catapult/devil/devil/android/sdk/build_tools.py
../../../third_party/catapult/devil/devil/android/sdk/bundletool.py
../../../third_party/catapult/devil/devil/android/sdk/intent.py
../../../third_party/catapult/devil/devil/android/sdk/keyevent.py
../../../third_party/catapult/devil/devil/android/sdk/split_select.py
../../../third_party/catapult/devil/devil/android/sdk/version_codes.py
../../../third_party/catapult/devil/devil/android/tools/__init__.py
../../../third_party/catapult/devil/devil/android/tools/script_common.py
../../../third_party/catapult/devil/devil/base_error.py
../../../third_party/catapult/devil/devil/constants/__init__.py
../../../third_party/catapult/devil/devil/constants/exit_codes.py
../../../third_party/catapult/devil/devil/devil_env.py
../../../third_party/catapult/devil/devil/utils/__init__.py
../../../third_party/catapult/devil/devil/utils/cmd_helper.py
../../../third_party/catapult/devil/devil/utils/host_utils.py
../../../third_party/catapult/devil/devil/utils/lazy/__init__.py
../../../third_party/catapult/devil/devil/utils/lazy/weak_constant.py
../../../third_party/catapult/devil/devil/utils/logging_common.py
../../../third_party/catapult/devil/devil/utils/lsusb.py
../../../third_party/catapult/devil/devil/utils/parallelizer.py
../../../third_party/catapult/devil/devil/utils/reraiser_thread.py
../../../third_party/catapult/devil/devil/utils/reset_usb.py
../../../third_party/catapult/devil/devil/utils/run_tests_helper.py
../../../third_party/catapult/devil/devil/utils/timeout_retry.py
../../../third_party/catapult/devil/devil/utils/watchdog_timer.py
../../../third_party/catapult/devil/devil/utils/zip_utils.py
../../../third_party/catapult/third_party/zipfile/zipfile_2_7_13.py
avd.py
proto/__init__.py
proto/avd_pb2.py
tools/android/avd/proto/avd_pb2.py deleted 100644 → 0
View file @ d6f52fd9
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: avd.proto
import sys
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf import descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
DESCRIPTOR = _descriptor.FileDescriptor(
name='avd.proto',
package='tools.android.avd.proto',
syntax='proto3',
serialized_pb=_b('\n\tavd.proto\x12\x17tools.android.avd.proto\"G\n\x0b\x43IPDPackage\x12\x14\n\x0cpackage_name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\x12\x11\n\tdest_path\x18\x03 \x01(\t\"\xf1\x01\n\x03\x41vd\x12>\n\x10\x65mulator_package\x18\x01 \x01(\x0b\x32$.tools.android.avd.proto.CIPDPackage\x12\x42\n\x14system_image_package\x18\x02 \x01(\x0b\x32$.tools.android.avd.proto.CIPDPackage\x12\x19\n\x11system_image_name\x18\x03 \x01(\t\x12\x39\n\x0b\x61vd_package\x18\x04 \x01(\x0b\x32$.tools.android.avd.proto.CIPDPackage\x12\x10\n\x08\x61vd_name\x18\x05 \x01(\tb\x06proto3')
)
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
_CIPDPACKAGE = _descriptor.Descriptor(
name='CIPDPackage',
full_name='tools.android.avd.proto.CIPDPackage',
filename=None,
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(
name='package_name', full_name='tools.android.avd.proto.CIPDPackage.package_name', index=0,
number=1, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='version', full_name='tools.android.avd.proto.CIPDPackage.version', index=1,
number=2, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='dest_path', full_name='tools.android.avd.proto.CIPDPackage.dest_path', index=2,
number=3, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None),
],
extensions=[
],
nested_types=[],
enum_types=[
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
serialized_start=38,
serialized_end=109,
)
_AVD = _descriptor.Descriptor(
name='Avd',
full_name='tools.android.avd.proto.Avd',
filename=None,
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(
name='emulator_package', full_name='tools.android.avd.proto.Avd.emulator_package', index=0,
number=1, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='system_image_package', full_name='tools.android.avd.proto.Avd.system_image_package', index=1,
number=2, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='system_image_name', full_name='tools.android.avd.proto.Avd.system_image_name', index=2,
number=3, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='avd_package', full_name='tools.android.avd.proto.Avd.avd_package', index=3,
number=4, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='avd_name', full_name='tools.android.avd.proto.Avd.avd_name', index=4,
number=5, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None),
],
extensions=[
],
nested_types=[],
enum_types=[
],
options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
oneofs=[
],
serialized_start=112,
serialized_end=353,
)
_AVD.fields_by_name['emulator_package'].message_type = _CIPDPACKAGE
_AVD.fields_by_name['system_image_package'].message_type = _CIPDPACKAGE
_AVD.fields_by_name['avd_package'].message_type = _CIPDPACKAGE
DESCRIPTOR.message_types_by_name['CIPDPackage'] = _CIPDPACKAGE
DESCRIPTOR.message_types_by_name['Avd'] = _AVD
CIPDPackage = _reflection.GeneratedProtocolMessageType('CIPDPackage', (_message.Message,), dict(
DESCRIPTOR = _CIPDPACKAGE,
__module__ = 'avd_pb2'
# @@protoc_insertion_point(class_scope:tools.android.avd.proto.CIPDPackage)
))
_sym_db.RegisterMessage(CIPDPackage)
Avd = _reflection.GeneratedProtocolMessageType('Avd', (_message.Message,), dict(
DESCRIPTOR = _AVD,
__module__ = 'avd_pb2'
# @@protoc_insertion_point(class_scope:tools.android.avd.proto.Avd)
))
_sym_db.RegisterMessage(Avd)
# @@protoc_insertion_point(module_scope)
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