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

Disable API level and kernel version static asserts for RISC-V.

Browse source 
(riscv isn't released, and thus is 10000)

Should fix:
  Broken build 13940537 on git_main-without-vendor on aosp_cf_riscv64_phone-aosp_current-userdebug

FAILED: ...
packages/modules/Connectivity/bpf/loader/NetBpfLoad.cpp:91:15: error: static assertion failed due to requirement '10000 == 30': NetBpfLoad must be compiled for 30/R
   91 | static_assert(__ANDROID_API__ == 30, "NetBpfLoad must be compiled for 30/R");
      |               ^~~~~~~~~~~~~~~~~~~~~
<built-in>:500:25: note: expanded from macro '__ANDROID_API__'
  500 | #define __ANDROID_API__ __ANDROID_MIN_SDK_VERSION__
      |                         ^
<built-in>:499:37: note: expanded from macro '__ANDROID_MIN_SDK_VERSION__'
  499 | #define __ANDROID_MIN_SDK_VERSION__ 10000
      |                                     ^
1 error generated.

Bug: 438908493
Test: TreeHugger
Flag: EXEMPT mainline & compile fix for unreleased RiscV
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I50ba1c3159c277fb8becb68220ba0885cf30e996
This commit is contained in:
Maciej Żenczykowski 2025-08-15 05:27:39 -07:00
commit 8c3023ad3b
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bpf/loader/NetBpfLoad.cpp
View file

@ -88,8 +88,10 @@ using std::vector;
namespace android {
namespace bpf {
#if !defined(__riscv)
static_assert(__ANDROID_API__ == 30, "NetBpfLoad must be compiled for 30/R");
static_assert(!minSupportedKernelVer, "NetBpfLoad must not assume min kver");
#endif
// Returns the build type string (from ro.build.type).
const std::string& getBuildType() {