diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp index 9757daad9d..91328579c4 100644 --- a/Tethering/apex/Android.bp +++ b/Tethering/apex/Android.bp @@ -96,6 +96,7 @@ apex { }, binaries: [ "clatd", + "netbpfload", "ot-daemon", ], canned_fs_config: "canned_fs_config", diff --git a/Tethering/apex/canned_fs_config b/Tethering/apex/canned_fs_config index 5a033471d5..1f5fcfaef5 100644 --- a/Tethering/apex/canned_fs_config +++ b/Tethering/apex/canned_fs_config @@ -1,2 +1,3 @@ /bin/for-system 0 1000 0750 /bin/for-system/clatd 1029 1029 06755 +/bin/netbpfload 0 0 0750 diff --git a/netbpfload/Android.bp b/netbpfload/Android.bp index d4e7ba8cb2..5480ef73e8 100644 --- a/netbpfload/Android.bp +++ b/netbpfload/Android.bp @@ -36,4 +36,13 @@ cc_binary { "loader.cpp", "NetBpfLoad.cpp", ], + apex_available: [ + "com.android.tethering", + "//apex_available:platform", + ], + // really should be Android 14/U (34), but we cannot include binaries built + // against newer sdk in the apex, which still targets 30(R): + // module "netbpfload" variant "android_x86_apex30": should support + // min_sdk_version(30) for "com.android.tethering": newer SDK(34). + min_sdk_version: "30", }