Skip to content

Commit

Permalink
Removing the FileObserver protocol that intended to replace SpeakEasy…
Browse files Browse the repository at this point in the history
…, as the LocalSocket protocol is superior and the FileObserver protocol was never adopted.

PiperOrigin-RevId: 688320259
  • Loading branch information
copybara-androidxtest committed Nov 11, 2024
1 parent 8047902 commit 4888903
Show file tree
Hide file tree
Showing 12 changed files with 4 additions and 1,205 deletions.
3 changes: 2 additions & 1 deletion services/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
ShellMain. This obsoletes SpeakEasy; if androidx.test.services is killed
(e.g. by the low memory killer) between the start of the app_process that
invokes LocalSocketShellMain and the start of the test, the test is still able
to talk to LocalSocketShellMain.
to talk to LocalSocketShellMain. The FileObserver-based protocol has been
removed.

**Breaking Changes**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,6 @@ package(default_applicable_licenses = ["//services:license"])

licenses(["notice"])

kt_android_library(
name = "coroutine_file_observer",
srcs = [
"CoroutineFileObserver.kt",
],
visibility = ["//visibility:private"],
deps = [
"@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
],
)

kt_android_library(
name = "file_observer_protocol",
srcs = [
"FileObserverProtocol.kt",
"Messages.kt",
],
visibility = [
"//services/shellexecutor/javatests/androidx/test/services/shellexecutor:__subpackages__",
],
)

proto_library(
name = "local_socket_protocol_pb",
srcs = ["local_socket_protocol.proto"],
Expand Down Expand Up @@ -59,21 +37,17 @@ kt_android_library(
name = "exec_server",
srcs = [
"BlockingPublish.java",
"FileObserverShellMain.kt",
"LocalSocketShellMain.kt",
"ShellCommand.java",
"ShellCommandExecutor.java",
"ShellCommandExecutorServer.java",
"ShellCommandFileObserverExecutorServer.kt",
"ShellCommandLocalSocketExecutorServer.kt",
"ShellExecSharedConstants.java",
"ShellMain.java",
],
idl_srcs = ["Command.aidl"],
visibility = [":export"],
deps = [
":coroutine_file_observer",
":file_observer_protocol",
":local_socket_protocol",
":local_socket_protocol_pb_java_proto_lite",
"//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
Expand All @@ -91,20 +65,16 @@ kt_android_library(
"ClientNotConnected.java",
"ShellCommand.java",
"ShellCommandClient.java",
"ShellCommandFileObserverClient.kt",
"ShellCommandLocalSocketClient.kt",
"ShellExecSharedConstants.java",
"ShellExecutor.java",
"ShellExecutorFactory.java",
"ShellExecutorFileObserverImpl.kt",
"ShellExecutorImpl.java",
"ShellExecutorLocalSocketImpl.kt",
],
idl_srcs = ["Command.aidl"],
visibility = [":export"],
deps = [
":coroutine_file_observer",
":file_observer_protocol",
":local_socket_protocol",
":local_socket_protocol_pb_java_proto_lite",
"//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
Expand Down

This file was deleted.

Loading

0 comments on commit 4888903

Please sign in to comment.