Reapply "replace platform netbpfload binary with a symlink to apex"
This reverts commit e636c61fd72d32899629514f5da84076d0739146.
Reason for revert: main is now building mainline modules from source
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0fc96a9eda10deed8f2d014fcb6f12a71ba73571
diff --git a/netbpfload/Android.bp b/netbpfload/Android.bp
index f397b37..2b603fc 100644
--- a/netbpfload/Android.bp
+++ b/netbpfload/Android.bp
@@ -26,11 +26,19 @@
installed_location: "bin/ethtool",
}
+install_symlink {
+ name: "platform_netbpfload_symlink",
+ symlink_target: "/apex/com.android.tethering/bin/netbpfload",
+ installed_location: "bin/netbpfload",
+ init_rc: ["netbpfload.rc"],
+}
+
phony {
name: "mainline_tethering_platform_components",
required: [
- "netbpfload",
+ "bpfloader",
"platform_ethtool_symlink",
+ "platform_netbpfload_symlink",
],
}
@@ -65,9 +73,7 @@
// module "netbpfload" variant "android_x86_apex30": should support
// min_sdk_version(30) for "com.android.tethering": newer SDK(34).
min_sdk_version: "30",
-
- init_rc: ["netbpfload.rc"],
- required: ["bpfloader"],
+ installable: false,
}
// Versioned netbpfload init rc: init system will process it only on api T/33+ devices