diff --git a/CMakeLists.txt b/CMakeLists.txt index 03a26c2468d764f23c58806e24c677da7ee6494f..9a34d937bc0d3249eb11f6fc40f76d2aab1fb51c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,6 +92,8 @@ target_link_options(jsvm "-Wl,--exclude-libs=libc++_static.a" ) +string(FIND "$ENV{SYSROOT}" "rk3568" RK3568_INDEX) +if (RK3568_INDEX LESS 0) if ((DEFINED USE_LIBZ_INNER) AND USE_LIBZ_INNER) target_link_libraries(jsvm libz_inner.a @@ -125,3 +127,4 @@ target_link_libraries(jsvm c++_static ) endif() +endif() diff --git a/build_jsvm_inter.sh b/build_jsvm_inter.sh index 7840366bdeaca034cd81546051b17a084fc9f593..f5beeb4e0c44a3e84dd9db8d67369f9007971f1c 100755 --- a/build_jsvm_inter.sh +++ b/build_jsvm_inter.sh @@ -141,6 +141,7 @@ do_env() { if [[ "${TARGET_CPU}" = "arm" ]]; then cflags=" --target=arm-linux-ohos" cflags+=" --sysroot=${SYSROOT}" + cflags+=" -isystem ${SYSROOT}/usr/include/arm-linux-ohos" cflags+=" -march=armv7-a" cflags+=" -mfpu=neon" cflags+=" -mbranch-protection=pac-ret+b-key+bti" @@ -149,6 +150,7 @@ do_env() { elif [[ "${TARGET_CPU}" = "arm64" ]]; then cflags=" --target=aarch64-linux-ohos" cflags+=" --sysroot=${SYSROOT}" + cflags+=" -isystem ${SYSROOT}/usr/include/aarch64-linux-ohos" cflags+=" -march=armv8-a" cflags+=" -DV8_OS_OH=1" cflags+=" -mfpu=neon" @@ -158,7 +160,7 @@ do_env() { elif [[ "${TARGET_CPU}" = "x86_64" ]]; then cflags="--target=x86_64-linux-ohos" cflags+=" --sysroot=${SYSROOT}" - cflags+=" -isystem ${SYSROOT}/usr/include/x86_64-linux-ohos" + cflags+=" -isystem ${SYSROOT}/usr/include/x86_64-linux-ohos" cflags+=" -DV8_OS_OH=1" ARCH="x86_64" else diff --git a/copy_v8.sh b/copy_v8.sh index 2cbec7f0caae1cec46cf5b8baa8f74de803ee2c5..6cb0cc64bcb8042c18b26e152dea48ebb465e27d 100755 --- a/copy_v8.sh +++ b/copy_v8.sh @@ -16,15 +16,16 @@ v8_path=$3 target_cpu=$4 JSVM_PATH=$(dirname $(readlink -f "$0")) +js_engine_url_version=arkcompiler_jsvm_20250527.tar.gz +llvm_version=llvm-linux-19.1.7-x86_64.tar.gz if [ ! -d "${v8_path}/v8" ]; then - wget -o ${JSVM_PATH}/wget_download.log -O ${JSVM_PATH}/arkcompiler_jsvm_20250514.tar.gz https://mirrors.huaweicloud.com/openharmony/compiler/jsvm/arkcompiler_jsvm_20250514.tar.gz + wget -o ${JSVM_PATH}/wget_download.log -O ${JSVM_PATH}/${js_engine_url_version} https://mirrors.huaweicloud.com/openharmony/compiler/jsvm/${js_engine_url_version} + wget -o ${JSVM_PATH}/wget_download.log -O ${JSVM_PATH}/${llvm_version} https://mirrors.huaweicloud.com/openharmony/compiler/jsvm/${llvm_version} cd ${JSVM_PATH} - tar -zxf arkcompiler_jsvm_20250514.tar.gz - cp -r ${JSVM_PATH}/js_engine_url/v8 ${v8_path} - mkdir -p "${v8_path}/v8-include" - cp -r ${JSVM_PATH}/js_engine_url/v8-include ${v8_path}/v8-include/ - mkdir -p "${v8_path}/v8/arm64/lib.unstripped_v8/lib.unstripped" - cp -r ${v8_path}/v8/arm64/libv8_shared.so ${v8_path}/v8/arm64/lib.unstripped_v8/lib.unstripped + tar -zxf ${js_engine_url_version} + tar -zxf ${llvm_version} + cp -r ${JSVM_PATH}/js_engine_url/* ${v8_path} + cp -r ${JSVM_PATH}/llvm ${v8_path} fi cp -u ${v8_path}/v8/${target_cpu}/libv8_shared.so ${TARGET_GEN_DIR}/libv8_shared.so