build netbpfload into the tethering apex am: a2a3d754a6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781564 Change-Id: I2551e588e692428c67dc6a48a563e92e693a2d23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
7dd74423c4
@@ -96,6 +96,7 @@ apex {
|
|||||||
},
|
},
|
||||||
binaries: [
|
binaries: [
|
||||||
"clatd",
|
"clatd",
|
||||||
|
"netbpfload",
|
||||||
"ot-daemon",
|
"ot-daemon",
|
||||||
],
|
],
|
||||||
canned_fs_config: "canned_fs_config",
|
canned_fs_config: "canned_fs_config",
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
/bin/for-system 0 1000 0750
|
/bin/for-system 0 1000 0750
|
||||||
/bin/for-system/clatd 1029 1029 06755
|
/bin/for-system/clatd 1029 1029 06755
|
||||||
|
/bin/netbpfload 0 0 0750
|
||||||
|
|||||||
@@ -36,4 +36,13 @@ cc_binary {
|
|||||||
"loader.cpp",
|
"loader.cpp",
|
||||||
"NetBpfLoad.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",
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user