Skip to content

Commit

Permalink
Internal change
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 713197207
  • Loading branch information
aCombray authored and copybara-github committed Jan 8, 2025
1 parent eb122f2 commit a9a883d
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ olc_server_binary(
"//src/java/com/google/devtools/mobileharness/infra/ats/server/sessionplugin:ats_server_session_plugin",
"//src/java/com/google/devtools/mobileharness/infra/client/api/mode/ats",
"//src/java/com/google/devtools/mobileharness/shared/util/comm/relay/service:server_utils_impl",
"//src/java/com/google/wireless/qa/mobileharness/shared/api:ats_test_client",
"//src/java/com/google/wireless/qa/mobileharness/shared/api:xts_test_client",
"@io_grpc_grpc_java//alts",
"@maven//:com_mysql_mysql_connector_j",
"@maven//:com_kohlschutter_junixsocket_junixsocket_common",
Expand All @@ -49,7 +49,7 @@ olc_server_binary(
"//src/java/com/google/devtools/mobileharness/infra/ats/local/sessionplugin:ats_local_session_plugin",
"//src/java/com/google/devtools/mobileharness/infra/ats/console/controller/sessionplugin:ats_session_plugin",
"//src/java/com/google/devtools/mobileharness/infra/client/api/mode/local",
"//src/java/com/google/wireless/qa/mobileharness/shared/api:ats_test",
"//src/java/com/google/wireless/qa/mobileharness/shared/api:xts_test",
],
)

Expand Down
43 changes: 37 additions & 6 deletions src/java/com/google/wireless/qa/mobileharness/shared/api/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,17 @@ package(
java_library(
name = "oss_lab_test",
runtime_deps = [
":ats_test",
":no_op_test",
":partner_test",
":xts_test",
],
)

# runtime_deps for ATS tests.
# runtime_deps for XTS tests.
java_library(
name = "ats_test",
name = "xts_test",
runtime_deps = [
":ats_test_client",
":xts_test_client",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/decorator:android_adb_shell_decorator",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/decorator:android_ats_dynamic_config_pusher_decorator",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/decorator:android_clean_apps_decorator",
Expand All @@ -60,9 +61,9 @@ java_library(
],
)

# Client side runtime_deps for ATS tests.
# Client side runtime_deps for XTS tests.
java_library(
name = "ats_test_client",
name = "xts_test_client",
runtime_deps = [
"//src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job:android_adb_shell_decorator_job_validator",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job:android_clean_apps_decorator_job_validator",
Expand All @@ -73,6 +74,36 @@ java_library(
],
)

# runtime_deps for partner tests.
java_library(
name = "partner_test",
runtime_deps = [
":partner_test_client",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/decorator:android_file_puller_decorator",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/decorator:android_file_pusher_decorator",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/decorator:android_logcat_decorator",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/decorator:android_switch_language_decorator",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/device:android_local_emulator",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/device:android_real_device",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/device:failed_device",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/driver:android_instrumentation",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/driver:android_native_bin",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/validator/env:android_native_bin_env_validator",
],
)

# Client side runtime_deps for partner tests.
java_library(
name = "partner_test_client",
runtime_deps = [
"//src/java/com/google/wireless/qa/mobileharness/shared/api/lister:android_native_bin_lister",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job:android_file_puller_decorator_job_validator",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job:android_logcat_decorator_job_validator",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job:android_native_bin_job_validator",
"//src/java/com/google/wireless/qa/mobileharness/shared/api/validator/job:android_switch_language_decorator_job_validator",
],
)

# runtime_deps for no-op tests.
java_library(
name = "no_op_test",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ public class BinarySizeTest {
"com/google/devtools/mobileharness/platform/android/xts/agent/tradefed_invocation_agent_deploy.jar");
private static final ImmutableSet<String> LAB_SERVER_LARGE_RESOURCE_PATH_ALLOWLIST =
ImmutableSet.of(
"com/google/devtools/mobileharness/platform/android/xts/agent/tradefed_invocation_agent_deploy.jar");
"com/google/devtools/mobileharness/platform/android/xts/agent/tradefed_invocation_agent_deploy.jar",
"com/google/wireless/qa/mobileharness/tool/android/language/switchlanguage.apk");
private static final ImmutableSet<String> ATS_CONSOLE_LARGE_RESOURCE_PATH_ALLOWLIST =
ImmutableSet.of();

Expand Down

0 comments on commit a9a883d

Please sign in to comment.