Merge remote-tracking branch 'upstream/develop' into develop

# Conflicts: # tools/build.sh

Merge remote-tracking branch 'upstream/develop' into develop
# Conflicts: # tools/build.sh
3497d6b6 · wangliu · 95d7fb80 · 3497d6b6
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

tools/build.sh tools/build.sh +1 -1

未找到文件。
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -86,7 +86,7 @@ build_for_android() {
        -DANDROID=true \
        -D"${ARM_PLATFORM}"=true
    fi
-    cd "./build/release/${PLATFORM}"
+    cd "../build/release/${PLATFORM}"
    make -j 8

 }