aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKangping Dong <wgtdkp@google.com>2023-07-05 08:52:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-07-05 08:52:12 +0000
commit39928f7065ca68daaa3a4e1e759515e700a2c90e (patch)
tree193317dea8b3b3254e0be99830fd5c7468204c05
parentea6ce93a2ed9c35ee72636ebd565fd44c614ba5f (diff)
parentc4de3aeab95c5a753d6abfcf010fb70bebf87f5d (diff)
downloadThreadNetwork-39928f7065ca68daaa3a4e1e759515e700a2c90e.tar.gz
Merge "rename otbr-agent to ot-daemon" am: 9c5ca41af6 am: a9975c7b2d am: 5b3d5112bb am: c4de3aeab9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/ThreadNetwork/+/2648203 Change-Id: I57b1a58b28f2da8763991a8369466c4f76787ea1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--apex/Android.bp2
-rw-r--r--apex/threadnetwork.rc2
2 files changed, 2 insertions, 2 deletions
diff --git a/apex/Android.bp b/apex/Android.bp
index 96c876c..8984389 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -23,7 +23,7 @@ apex_defaults {
min_sdk_version: "current",
binaries: [
- "otbr-agent",
+ "ot-daemon",
"ot-ctl",
],
compile_multilib: "both",
diff --git a/apex/threadnetwork.rc b/apex/threadnetwork.rc
index a872b83..8434c8a 100644
--- a/apex/threadnetwork.rc
+++ b/apex/threadnetwork.rc
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-service otbr-agent /apex/com.android.threadnetwork/bin/otbr-agent -I thread-wpan threadnetwork_hal://binder?none
+service ot-daemon /apex/com.android.threadnetwork/bin/ot-daemon -I thread-wpan threadnetwork_hal://binder?none
disabled
updatable
capabilities NET_RAW