diff options
| author | Maciej Żenczykowski <maze@google.com> | 2024-03-06 02:31:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-06 02:31:06 +0000 |
| commit | 5e86dcf660af60ad7a1a33d18f271f7043db72b9 (patch) | |
| tree | 407c6e59aa1b3779b6d46a2d7d4f795319cb2736 | |
| parent | 5cd4f4001529d0e895881eae73b1e0fdfdd0a9df (diff) | |
| parent | 15d9b5c16989b5c681f15d9ae4ac4b9dc4a85396 (diff) | |
| download | netd-5e86dcf660af60ad7a1a33d18f271f7043db72b9.tar.gz | |
Merge "netd: switch to requiring 'mainline_tethering_platform_components'" into main am: 15d9b5c169
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2983223
Change-Id: I0681b1ebfdd78fd22fa2fee1471ce1555e030d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | server/Android.bp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/server/Android.bp b/server/Android.bp index d68950ea..b5a013c1 100644 --- a/server/Android.bp +++ b/server/Android.bp @@ -147,14 +147,6 @@ cc_defaults { ], } -install_symlink { - name: "ethtool_symlink", - symlink_target: "/apex/com.android.tethering/bin/ethtool", - // installed_location is relative to /system because that's the default partition for soong - // modules, unless we add something like `system_ext_specific: true` like in hwservicemanager. - installed_location: "bin/ethtool", -} - cc_binary { name: "netd", defaults: [ @@ -163,8 +155,7 @@ cc_binary { init_rc: ["netd.rc"], vintf_fragments: ["android.system.net.netd-service.xml"], required: [ - "netbpfload", - "ethtool_symlink", + "mainline_tethering_platform_components", ], srcs: [ "main.cpp", |