build netbpfload into the tethering apex am: a2a3d754a6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781564

Change-Id: I8bbd18d6ee60024b177235f221602f267082c110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski
2023-10-11 04:10:01 +00:00
committed by Automerger Merge Worker
3 changed files with 11 additions and 0 deletions

View File

@@ -96,6 +96,7 @@ apex {
},
binaries: [
"clatd",
"netbpfload",
"ot-daemon",
],
canned_fs_config: "canned_fs_config",

View File

@@ -1,2 +1,3 @@
/bin/for-system 0 1000 0750
/bin/for-system/clatd 1029 1029 06755
/bin/netbpfload 0 0 0750

View File

@@ -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",
}