Change in the protobuf build script.
TestScheduleConfigMessage_pb2.py is now being imported from
vti/dashboard/proto/TestSuiteResultMessage_pb2.pyc, so the pb2
build scripts for both project need to have the same path settings.
Test: $ ./script/build-python.sh, and then execute the HC
Bug: 110385755
Change-Id: Ibbe5b9dbf51bf1613f962cfe60972cf1a369a81a
diff --git a/proto/TestScheduleConfigMessage_pb2.py b/proto/TestScheduleConfigMessage_pb2.py
index 63e3779..46dafac 100644
--- a/proto/TestScheduleConfigMessage_pb2.py
+++ b/proto/TestScheduleConfigMessage_pb2.py
@@ -1,5 +1,5 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
-# source: TestScheduleConfigMessage.proto
+# source: vti/test_serving/proto/TestScheduleConfigMessage.proto
import sys
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
@@ -17,10 +17,10 @@
DESCRIPTOR = _descriptor.FileDescriptor(
- name='TestScheduleConfigMessage.proto',
+ name='vti/test_serving/proto/TestScheduleConfigMessage.proto',
package='android.test.lab',
syntax='proto2',
- serialized_pb=_b('\n\x1fTestScheduleConfigMessage.proto\x12\x10\x61ndroid.test.lab\"\xe4\x01\n\x15ScheduleConfigMessage\x12\x17\n\x0fmanifest_branch\x18\x01 \x01(\x0c\x12\x16\n\x0epab_account_id\x18\x02 \x01(\x0c\x12V\n\x12\x62uild_storage_type\x18\x03 \x01(\x0e\x32\".android.test.lab.BuildStorageType:\x16\x42UILD_STORAGE_TYPE_PAB\x12\x42\n\x0c\x62uild_target\x18\x0b \x03(\x0b\x32,.android.test.lab.BuildScheduleConfigMessage\"\xd2\x01\n\x1a\x42uildScheduleConfigMessage\x12\x0c\n\x04name\x18\x01 \x01(\x0c\x12#\n\x1brequire_signed_device_build\x18\x02 \x01(\x08\x12 \n\x12has_bootloader_img\x18\x03 \x01(\x08:\x04true\x12\x1b\n\rhas_radio_img\x18\x04 \x01(\x08:\x04true\x12\x42\n\rtest_schedule\x18\x0b \x03(\x0b\x32+.android.test.lab.TestScheduleConfigMessage\"\xe4\x05\n\x19TestScheduleConfigMessage\x12\x11\n\ttest_name\x18\x01 \x01(\x0c\x12\x0e\n\x06period\x18\x02 \x01(\x05\x12\x10\n\x08priority\x18\x03 \x01(\x0c\x12\x0e\n\x06\x64\x65vice\x18\x04 \x03(\x0c\x12\x0e\n\x06shards\x18\x05 \x01(\x05\x12\x1f\n\x17required_host_equipment\x18\x06 \x03(\x0c\x12!\n\x19required_device_equipment\x18\x07 \x03(\x0c\x12\r\n\x05param\x18\x0b \x01(\x0c\x12T\n\x10gsi_storage_type\x18\x18 \x01(\x0e\x32\".android.test.lab.BuildStorageType:\x16\x42UILD_STORAGE_TYPE_PAB\x12\x12\n\ngsi_branch\x18\x15 \x01(\x0c\x12\x18\n\x10gsi_build_target\x18\x16 \x01(\x0c\x12\x1a\n\x12gsi_pab_account_id\x18\x17 \x01(\x0c\x12\x1a\n\x12gsi_vendor_version\x18\x19 \x01(\x0c\x12U\n\x11test_storage_type\x18\" \x01(\x0e\x32\".android.test.lab.BuildStorageType:\x16\x42UILD_STORAGE_TYPE_PAB\x12\x13\n\x0btest_branch\x18\x1f \x01(\x0c\x12\x19\n\x11test_build_target\x18 \x01(\x0c\x12\x1b\n\x13test_pab_account_id\x18! \x01(\x0c\x12\x13\n\x0bretry_count\x18) \x01(\x05\x12\x16\n\x07\x64isable\x18\x33 \x01(\x08:\x05\x66\x61lse\x12\x1f\n\x17image_package_repo_base\x18= \x01(\x0c\x12\x15\n\rreport_bucket\x18G \x03(\x0c\x12\x1d\n\x15report_spreadsheet_id\x18H \x03(\x0c\x12\x1d\n\x15report_persistent_url\x18I \x03(\x0c\x12\x1c\n\x14report_reference_url\x18J \x03(\x0c*j\n\x10\x42uildStorageType\x12\x1e\n\x1aUNKNOWN_BUILD_STORAGE_TYPE\x10\x00\x12\x1a\n\x16\x42UILD_STORAGE_TYPE_PAB\x10\x01\x12\x1a\n\x16\x42UILD_STORAGE_TYPE_GCS\x10\x02')
+ serialized_pb=_b('\n6vti/test_serving/proto/TestScheduleConfigMessage.proto\x12\x10\x61ndroid.test.lab\"\xe4\x01\n\x15ScheduleConfigMessage\x12\x17\n\x0fmanifest_branch\x18\x01 \x01(\x0c\x12\x16\n\x0epab_account_id\x18\x02 \x01(\x0c\x12V\n\x12\x62uild_storage_type\x18\x03 \x01(\x0e\x32\".android.test.lab.BuildStorageType:\x16\x42UILD_STORAGE_TYPE_PAB\x12\x42\n\x0c\x62uild_target\x18\x0b \x03(\x0b\x32,.android.test.lab.BuildScheduleConfigMessage\"\xd2\x01\n\x1a\x42uildScheduleConfigMessage\x12\x0c\n\x04name\x18\x01 \x01(\x0c\x12#\n\x1brequire_signed_device_build\x18\x02 \x01(\x08\x12 \n\x12has_bootloader_img\x18\x03 \x01(\x08:\x04true\x12\x1b\n\rhas_radio_img\x18\x04 \x01(\x08:\x04true\x12\x42\n\rtest_schedule\x18\x0b \x03(\x0b\x32+.android.test.lab.TestScheduleConfigMessage\"\xe4\x05\n\x19TestScheduleConfigMessage\x12\x11\n\ttest_name\x18\x01 \x01(\x0c\x12\x0e\n\x06period\x18\x02 \x01(\x05\x12\x10\n\x08priority\x18\x03 \x01(\x0c\x12\x0e\n\x06\x64\x65vice\x18\x04 \x03(\x0c\x12\x0e\n\x06shards\x18\x05 \x01(\x05\x12\x1f\n\x17required_host_equipment\x18\x06 \x03(\x0c\x12!\n\x19required_device_equipment\x18\x07 \x03(\x0c\x12\r\n\x05param\x18\x0b \x01(\x0c\x12T\n\x10gsi_storage_type\x18\x18 \x01(\x0e\x32\".android.test.lab.BuildStorageType:\x16\x42UILD_STORAGE_TYPE_PAB\x12\x12\n\ngsi_branch\x18\x15 \x01(\x0c\x12\x18\n\x10gsi_build_target\x18\x16 \x01(\x0c\x12\x1a\n\x12gsi_pab_account_id\x18\x17 \x01(\x0c\x12\x1a\n\x12gsi_vendor_version\x18\x19 \x01(\x0c\x12U\n\x11test_storage_type\x18\" \x01(\x0e\x32\".android.test.lab.BuildStorageType:\x16\x42UILD_STORAGE_TYPE_PAB\x12\x13\n\x0btest_branch\x18\x1f \x01(\x0c\x12\x19\n\x11test_build_target\x18 \x01(\x0c\x12\x1b\n\x13test_pab_account_id\x18! \x01(\x0c\x12\x13\n\x0bretry_count\x18) \x01(\x05\x12\x16\n\x07\x64isable\x18\x33 \x01(\x08:\x05\x66\x61lse\x12\x1f\n\x17image_package_repo_base\x18= \x01(\x0c\x12\x15\n\rreport_bucket\x18G \x03(\x0c\x12\x1d\n\x15report_spreadsheet_id\x18H \x03(\x0c\x12\x1d\n\x15report_persistent_url\x18I \x03(\x0c\x12\x1c\n\x14report_reference_url\x18J \x03(\x0c*j\n\x10\x42uildStorageType\x12\x1e\n\x1aUNKNOWN_BUILD_STORAGE_TYPE\x10\x00\x12\x1a\n\x16\x42UILD_STORAGE_TYPE_PAB\x10\x01\x12\x1a\n\x16\x42UILD_STORAGE_TYPE_GCS\x10\x02')
)
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
@@ -45,8 +45,8 @@
],
containing_type=None,
options=None,
- serialized_start=1240,
- serialized_end=1346,
+ serialized_start=1263,
+ serialized_end=1369,
)
_sym_db.RegisterEnumDescriptor(_BUILDSTORAGETYPE)
@@ -104,8 +104,8 @@
extension_ranges=[],
oneofs=[
],
- serialized_start=54,
- serialized_end=282,
+ serialized_start=77,
+ serialized_end=305,
)
@@ -163,8 +163,8 @@
extension_ranges=[],
oneofs=[
],
- serialized_start=285,
- serialized_end=495,
+ serialized_start=308,
+ serialized_end=518,
)
@@ -355,8 +355,8 @@
extension_ranges=[],
oneofs=[
],
- serialized_start=498,
- serialized_end=1238,
+ serialized_start=521,
+ serialized_end=1261,
)
_SCHEDULECONFIGMESSAGE.fields_by_name['build_storage_type'].enum_type = _BUILDSTORAGETYPE
@@ -371,21 +371,21 @@
ScheduleConfigMessage = _reflection.GeneratedProtocolMessageType('ScheduleConfigMessage', (_message.Message,), dict(
DESCRIPTOR = _SCHEDULECONFIGMESSAGE,
- __module__ = 'TestScheduleConfigMessage_pb2'
+ __module__ = 'vti.test_serving.proto.TestScheduleConfigMessage_pb2'
# @@protoc_insertion_point(class_scope:android.test.lab.ScheduleConfigMessage)
))
_sym_db.RegisterMessage(ScheduleConfigMessage)
BuildScheduleConfigMessage = _reflection.GeneratedProtocolMessageType('BuildScheduleConfigMessage', (_message.Message,), dict(
DESCRIPTOR = _BUILDSCHEDULECONFIGMESSAGE,
- __module__ = 'TestScheduleConfigMessage_pb2'
+ __module__ = 'vti.test_serving.proto.TestScheduleConfigMessage_pb2'
# @@protoc_insertion_point(class_scope:android.test.lab.BuildScheduleConfigMessage)
))
_sym_db.RegisterMessage(BuildScheduleConfigMessage)
TestScheduleConfigMessage = _reflection.GeneratedProtocolMessageType('TestScheduleConfigMessage', (_message.Message,), dict(
DESCRIPTOR = _TESTSCHEDULECONFIGMESSAGE,
- __module__ = 'TestScheduleConfigMessage_pb2'
+ __module__ = 'vti.test_serving.proto.TestScheduleConfigMessage_pb2'
# @@protoc_insertion_point(class_scope:android.test.lab.TestScheduleConfigMessage)
))
_sym_db.RegisterMessage(TestScheduleConfigMessage)
diff --git a/script/build-python.sh b/script/build-python.sh
index e9d7e1d..f8d2fb0 100755
--- a/script/build-python.sh
+++ b/script/build-python.sh
@@ -15,11 +15,11 @@
# limitations under the License.
# Modifies any import statements (to remove subdir path)
-pushd ${ANDROID_BUILD_TOP}/test/vti/test_serving
+pushd ${ANDROID_BUILD_TOP}/test
-protoc -I=proto --python_out=proto proto/TestLabConfigMessage.proto
-protoc -I=proto --python_out=proto proto/TestScheduleConfigMessage.proto
-protoc -I=proto --python_out=proto proto/GreenBuildScheduleConfigMessage.proto
+protoc -I=. --python_out=. ./vti/test_serving/proto/TestLabConfigMessage.proto
+protoc -I=. --python_out=. ./vti/test_serving/proto/TestScheduleConfigMessage.proto
+protoc -I=. --python_out=. ./vti/test_serving/proto/GreenBuildScheduleConfigMessage.proto
# Compiles all the python source codes.
python -m compileall .
