Revert "bpf: change NetBpfLoad rc file from 33 (T/U) to 31 (S/Sv2/T/U)"
This reverts commit 0e9b0e05c69e0b06c88c688832e18c6ecdd939c4.
Reason for revert: needs a .31rc specific version instead.
Will merge the required changes into the followup commit.
Change-Id: I01e9dfee4aaabc3ddab39da7519b7d9963b84124
diff --git a/bpf/loader/Android.bp b/bpf/loader/Android.bp
index edb260c..b08913a 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 S/31+ devices
+// Versioned netbpfload init rc: init system will process it only on api T/33+ 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.31rc",
- src: "netbpfload.31rc",
- filename: "netbpfload.31rc",
+ name: "netbpfload.33rc",
+ src: "netbpfload.33rc",
+ filename: "netbpfload.33rc",
installable: false,
}
diff --git a/bpf/loader/netbpfload.31rc b/bpf/loader/netbpfload.33rc
similarity index 77%
rename from bpf/loader/netbpfload.31rc
rename to bpf/loader/netbpfload.33rc
index 6bc488e..eb937dd 100644
--- a/bpf/loader/netbpfload.31rc
+++ b/bpf/loader/netbpfload.33rc
@@ -1,8 +1,6 @@
-# This file takes effect only on S, T and U (on V netbpfload.35rc takes priority).
+# This file takes effect only on T and U (on V netbpfload.35rc takes priority).
#
-# The service is started from netd's
-# S: dnsresolver call into ADnsHelper_init
-# T/U: libnetd_updatable shared library
+# The service is started from netd's libnetd_updatable shared library
# on initial (boot time) startup of netd.
#
# However we never start this service on U QPR3.