Revert "replace platform netbpfload binary with a symlink to apex"
This reverts commit 7f3d748cef054e8b8b46af2f94cb1d00857bb460.
Reason for revert: Potential cause for Build failures: b/328408957
Change-Id: I2a1e2375429ce1556362d369a97724c829b5aeb6
diff --git a/netbpfload/Android.bp b/netbpfload/Android.bp
index 2b603fc..f397b37 100644
--- a/netbpfload/Android.bp
+++ b/netbpfload/Android.bp
@@ -26,19 +26,11 @@
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: [
- "bpfloader",
+ "netbpfload",
"platform_ethtool_symlink",
- "platform_netbpfload_symlink",
],
}
@@ -73,7 +65,9 @@
// module "netbpfload" variant "android_x86_apex30": should support
// min_sdk_version(30) for "com.android.tethering": newer SDK(34).
min_sdk_version: "30",
- installable: false,
+
+ init_rc: ["netbpfload.rc"],
+ required: ["bpfloader"],
}
// Versioned netbpfload init rc: init system will process it only on api T/33+ devices