commit 0c9f48d6ef96e7dc315e5cdd899b80149470e6a0
author Kangping Dong <wgtdkp@google.com> Fri Sep 01 19:24:14 2023 +0800
committer Kangping Dong <wgtdkp@google.com> Wed Sep 06 14:07:14 2023 +0800
tree e7a87ca4b15d943ed39db33a4a66232703dc87c9
parent fd10f344dcedf0529944d711353acf75ac823425

[Thread] move ot-daemon to the tethering module

The com.android.threadnetwork module is merged into
the com.android.tethering module now.

Bug: 296211911
Change-Id: I9fec91fff4e2ae4be26da4b0f52e739c4a251cd2

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 37b6171..9929c24 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -38,13 +38,6 @@
 }
 
 filegroup {
-  name: "com.android.threadnetwork-file_contexts",
-  srcs: [
-    "com.android.threadnetwork-file_contexts",
-  ],
-}
-
-filegroup {
   name: "com.android.sdkext-file_contexts",
   srcs: [
     "com.android.sdkext-file_contexts",

apex/com.android.tethering-file_contexts

diff --git a/apex/com.android.tethering-file_contexts b/apex/com.android.tethering-file_contexts
index af366d8..53843ea 100644
--- a/apex/com.android.tethering-file_contexts
+++ b/apex/com.android.tethering-file_contexts
@@ -1,3 +1,4 @@
 (/.*)?                  u:object_r:system_file:s0
 /bin/for-system/clatd   u:object_r:clatd_exec:s0
+/bin/ot-daemon          u:object_r:ot_daemon_exec:s0
 /lib(64)?(/.*)          u:object_r:system_lib_file:s0

apex/com.android.threadnetwork-file_contexts

diff --git a/apex/com.android.threadnetwork-file_contexts b/apex/com.android.threadnetwork-file_contexts
deleted file mode 100644
index 3264177..0000000
--- a/apex/com.android.threadnetwork-file_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-(/.*)?                         u:object_r:system_file:s0
-/bin/ot-daemon                 u:object_r:ot_daemon_exec:s0