joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "netbpfload: V+ x86 require 64-bit kernel" into main

Browse source
This commit is contained in:
Maciej Żenczykowski 2024-02-17 04:47:07 +00:00 • committed by Gerrit Code Review
commit e7ceb1dc29
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
netbpfload/NetBpfLoad.cpp
View file

@ -301,6 +301,11 @@ int main(int argc, char** argv, char * const envp[]) {
return 1;
}
if (isAtLeastV && android::bpf::isX86() && !android::bpf::isKernel64Bit()) {
ALOGE("Android V requires X86 kernel to be 64-bit.");
return 1;
}
if (android::bpf::isUserspace32bit() && android::bpf::isAtLeastKernelVersion(6, 2, 0)) {
/* Android 14/U should only launch on 64-bit kernels
* T launches on 5.10/5.15