bpf: change NetBpfLoad rc file from 33 (T/U) to 31 (S/Sv2/T/U)
By itself this change is a no-op, as we don't actually *yet* start mdnsd_netbpfload.
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic7665b3dd5716bd3bbdc96450a42e9b0c26441c9
diff --git a/bpf/loader/Android.bp b/bpf/loader/Android.bp
index b08913a..edb260c 100644
--- a/bpf/loader/Android.bp
+++ b/bpf/loader/Android.bp
@@ -56,15 +56,15 @@
installable: false,
}
-// Versioned netbpfload init rc: init system will process it only on api T/33+ devices
+// Versioned netbpfload init rc: init system will process it only on api S/31+ devices
// Note: R[30] S[31] Sv2[32] T[33] U[34] V[35])
//
// For details of versioned rc files see:
// https://android.googlesource.com/platform/system/core/+/HEAD/init/README.md#versioned-rc-files-within-apexs
prebuilt_etc {
- name: "netbpfload.33rc",
- src: "netbpfload.33rc",
- filename: "netbpfload.33rc",
+ name: "netbpfload.31rc",
+ src: "netbpfload.31rc",
+ filename: "netbpfload.31rc",
installable: false,
}
diff --git a/bpf/loader/netbpfload.33rc b/bpf/loader/netbpfload.31rc
similarity index 77%
rename from bpf/loader/netbpfload.33rc
rename to bpf/loader/netbpfload.31rc
index eb937dd..6bc488e 100644
--- a/bpf/loader/netbpfload.33rc
+++ b/bpf/loader/netbpfload.31rc
@@ -1,6 +1,8 @@
-# This file takes effect only on T and U (on V netbpfload.35rc takes priority).
+# This file takes effect only on S, T and U (on V netbpfload.35rc takes priority).
#
-# The service is started from netd's libnetd_updatable shared library
+# The service is started from netd's
+# S: dnsresolver call into ADnsHelper_init
+# T/U: libnetd_updatable shared library
# on initial (boot time) startup of netd.
#
# However we never start this service on U QPR3.