commit 31ca942f964d7869a80c357f82a103d38f39170e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Sep 03 20:54:25 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 03 20:54:25 2024 +0000
tree 1414a77d9b0fa3029bdcf30b9fb5a2d4bfd7fd1a
parent ad8b80236bf113274f78fcf8ab2522d2f93d4067
parent 2c018db04aa63f0808989ad5043899111e1f431b

Merge "thread: rename init.34rc to ot-daemon.34rc for clarity" into main am: 2c018db04a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3251272

Change-Id: If0f7dcd2021f0f82dce5509d25b3fbeab47696f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tethering/apex/Android.bp

diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index 8d96066..3b197fc 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -114,7 +114,7 @@
         "current_sdkinfo",
         "netbpfload.33rc",
         "netbpfload.35rc",
-        "ot-daemon.init.34rc",
+        "ot-daemon.34rc",
     ],
     manifest: "manifest.json",
     key: "com.android.tethering.key",

thread/apex/Android.bp

diff --git a/thread/apex/Android.bp b/thread/apex/Android.bp
index edf000a..838c0d9 100644
--- a/thread/apex/Android.bp
+++ b/thread/apex/Android.bp
@@ -23,8 +23,8 @@
 // See https://android.googlesource.com/platform/system/core/+/HEAD/init/README.md#versioned-rc-files-within-apexs
 // for details of versioned rc files.
 prebuilt_etc {
-    name: "ot-daemon.init.34rc",
+    name: "ot-daemon.34rc",
     src: "ot-daemon.34rc",
-    filename: "init.34rc",
+    filename: "ot-daemon.34rc",
     installable: false,
 }