Skip to content

Commit 6dd2bdb

Browse files
author
pippocao
committed
Avoid script execute failing when spaces are included in Android and OHOS sdk path
1 parent 168cd1b commit 6dd2bdb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build/lib/android/win_build_all_and_pack.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ If not Defined ANDROID_NDK_ROOT (
55
Echo ANDROID_NDK_ROOT is not defined! Build Cancelled!
66
goto :fail
77
)
8-
If not exist %ANDROID_NDK_ROOT% (
8+
If not exist "%ANDROID_NDK_ROOT%" (
99
Echo Folder %ANDROID_NDK_ROOT% Is Not Found! Build Cancelled!
1010
goto :fail
1111
)
@@ -58,10 +58,10 @@ for /l %%a in (0,1,3) do (
5858
-G="MinGW Makefiles"^
5959
-DANDROID_ABI=%%j^
6060
-DANDROID_PLATFORM=%ANDROID_PLATFORM%^
61-
-DANDROID_NDK=%ANDROID_NDK_ROOT%^
61+
-DANDROID_NDK="%ANDROID_NDK_ROOT%"^
6262
-DCMAKE_BUILD_TYPE="%%p"^
6363
-DBUILD_LIB_TYPE=dynamic_lib^
64-
-DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake^
64+
-DCMAKE_TOOLCHAIN_FILE="%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake"^
6565
-DTARGET_PLATFORM:STRING=android^
6666
-DANDROID_STL=none^
6767
|| exit /b 1

build/lib/ohos/win_build_all_and_pack.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ for %%T in (armeabi-v7a arm64-v8a x86_64) do (
2828
REM Convert NDK path to POSIX style for CMake
2929
set "NDK_POSIX=%NDK_PATH:\=/%"
3030

31-
cmake ../../../../src -G "Unix Makefiles" -DOHOS_ARCH=%%T -DCMAKE_BUILD_TYPE=%%C -DBUILD_LIB_TYPE=%%L -DCMAKE_TOOLCHAIN_FILE=!NDK_POSIX!/build/cmake/ohos.toolchain.cmake -DTARGET_PLATFORM:STRING=ohos -DOHOS_STL=c++_static || goto :error
31+
cmake ../../../../src -G "Unix Makefiles" -DOHOS_ARCH=%%T -DCMAKE_BUILD_TYPE=%%C -DBUILD_LIB_TYPE=%%L -DCMAKE_TOOLCHAIN_FILE="!NDK_POSIX!/build/cmake/ohos.toolchain.cmake" -DTARGET_PLATFORM:STRING=ohos -DOHOS_STL=c++_static || goto :error
3232

3333
REM Build and install
3434
cmake --build . -- -j%PARALLEL_JOBS% || goto :error

0 commit comments

Comments
 (0)