Skip to content

Commit 4888903

Browse files
Removing the FileObserver protocol that intended to replace SpeakEasy, as the LocalSocket protocol is superior and the FileObserver protocol was never adopted.
PiperOrigin-RevId: 688320259
1 parent 8047902 commit 4888903

File tree

12 files changed

+4
-1205
lines changed

12 files changed

+4
-1205
lines changed

services/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
ShellMain. This obsoletes SpeakEasy; if androidx.test.services is killed
1616
(e.g. by the low memory killer) between the start of the app_process that
1717
invokes LocalSocketShellMain and the start of the test, the test is still able
18-
to talk to LocalSocketShellMain.
18+
to talk to LocalSocketShellMain. The FileObserver-based protocol has been
19+
removed.
1920

2021
**Breaking Changes**
2122

services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,6 @@ package(default_applicable_licenses = ["//services:license"])
77

88
licenses(["notice"])
99

10-
kt_android_library(
11-
name = "coroutine_file_observer",
12-
srcs = [
13-
"CoroutineFileObserver.kt",
14-
],
15-
visibility = ["//visibility:private"],
16-
deps = [
17-
"@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
18-
],
19-
)
20-
21-
kt_android_library(
22-
name = "file_observer_protocol",
23-
srcs = [
24-
"FileObserverProtocol.kt",
25-
"Messages.kt",
26-
],
27-
visibility = [
28-
"//services/shellexecutor/javatests/androidx/test/services/shellexecutor:__subpackages__",
29-
],
30-
)
31-
3210
proto_library(
3311
name = "local_socket_protocol_pb",
3412
srcs = ["local_socket_protocol.proto"],
@@ -59,21 +37,17 @@ kt_android_library(
5937
name = "exec_server",
6038
srcs = [
6139
"BlockingPublish.java",
62-
"FileObserverShellMain.kt",
6340
"LocalSocketShellMain.kt",
6441
"ShellCommand.java",
6542
"ShellCommandExecutor.java",
6643
"ShellCommandExecutorServer.java",
67-
"ShellCommandFileObserverExecutorServer.kt",
6844
"ShellCommandLocalSocketExecutorServer.kt",
6945
"ShellExecSharedConstants.java",
7046
"ShellMain.java",
7147
],
7248
idl_srcs = ["Command.aidl"],
7349
visibility = [":export"],
7450
deps = [
75-
":coroutine_file_observer",
76-
":file_observer_protocol",
7751
":local_socket_protocol",
7852
":local_socket_protocol_pb_java_proto_lite",
7953
"//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
@@ -91,20 +65,16 @@ kt_android_library(
9165
"ClientNotConnected.java",
9266
"ShellCommand.java",
9367
"ShellCommandClient.java",
94-
"ShellCommandFileObserverClient.kt",
9568
"ShellCommandLocalSocketClient.kt",
9669
"ShellExecSharedConstants.java",
9770
"ShellExecutor.java",
9871
"ShellExecutorFactory.java",
99-
"ShellExecutorFileObserverImpl.kt",
10072
"ShellExecutorImpl.java",
10173
"ShellExecutorLocalSocketImpl.kt",
10274
],
10375
idl_srcs = ["Command.aidl"],
10476
visibility = [":export"],
10577
deps = [
106-
":coroutine_file_observer",
107-
":file_observer_protocol",
10878
":local_socket_protocol",
10979
":local_socket_protocol_pb_java_proto_lite",
11080
"//services/speakeasy/java/androidx/test/services/speakeasy:protocol",

services/shellexecutor/java/androidx/test/services/shellexecutor/CoroutineFileObserver.kt

Lines changed: 0 additions & 197 deletions
This file was deleted.

0 commit comments

Comments
 (0)