From 3e926967209ef252d7c950a5c16d8ec690a16d12 Mon Sep 17 00:00:00 2001 From: ZLangJIT Date: Sat, 5 Oct 2024 19:39:48 +0000 Subject: [PATCH] update to riscv-kernel-6.11.0 v15 --- libmedia.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libmedia.patch b/libmedia.patch index d34697d..e86c20c 100644 --- a/libmedia.patch +++ b/libmedia.patch @@ -125543,10 +125543,10 @@ index 00000000..ab21814b +#endif diff --git a/app/src/main/java/libengine/build_root.cmake b/app/src/main/java/libengine/build_root.cmake new file mode 100644 -index 00000000..c5b83982 +index 00000000..c3fe42a1 --- /dev/null +++ b/app/src/main/java/libengine/build_root.cmake -@@ -0,0 +1,815 @@ +@@ -0,0 +1,816 @@ +macro(build_root_message str) + if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/build_root_log.txt) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/build_root_log.txt "BUILD_ROOT LOG : ${str}\n") @@ -125873,7 +125873,8 @@ index 00000000..c5b83982 + + if(ANDROID) + build_root_exec(ls -l ${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin) -+ set(BUILD_ROOT_____________android_compiler_suffix linux-${ANDROID_PLATFORM}) ++ # replace ANDROID_PLATFORM==android-28 with linux-android28 ++ string(REPLACE "android-" "linux-android" BUILD_ROOT_____________android_compiler_suffix "${ANDROID_PLATFORM}") + set(BUILD_ROOT_____________cross_rc "") + # NDK 25 specifies the following, see ./ndk_25_bin.txt in this repo + if(CMAKE_ANDROID_ARCH_ABI MATCHES x86_64)