diff --git a/build/build.sh b/build/build.sh index 14f7a0f9963ddda0bf0463a66ac0fd32479c1387..3b5a983691c395a31219d53e00930a8d2a189c46 100755 --- a/build/build.sh +++ b/build/build.sh @@ -38,13 +38,13 @@ fi # builder third_party cd ${PROJECT_DIR}/third_party/ft_flutter -./build.sh -i +./build.sh $* cd ${PROJECT_DIR}/third_party/ft_multimedia -./build.sh +./build.sh $* cd ${PROJECT_DIR}/third_party/ft_mmi -./build.sh +./build.sh $* cd ${PROJECT_DIR} diff --git a/build/prebuild.sh b/build/prebuild.sh index 846b611791bb7d0fd6f589b0b0dd9a2069ba63c9..5ce7e965fa2b2caddf85f1d546061f45146c7219 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -49,7 +49,7 @@ PROJECT_DIR=$(dirname ${SCRIPT_DIR}) sudo pip3 install -r ${SCRIPT_DIR}/configs/requirements.txt # Remove out dir -rm -rf ${PROJECT_DIR}/out +# rm -rf ${PROJECT_DIR}/out # ============================================================================= # System Packages @@ -60,7 +60,7 @@ rm -rf ${PROJECT_DIR}/out echo -e "\e[36m[-] Prepare system packages...\e[0m" # Check & Install required system packages -python3 ${PROJECT_DIR}/build/builder.py check --install-packages $* +python3 ${PROJECT_DIR}/build/builder.py check --install-packages # ============================================================================= # Prebuild @@ -114,28 +114,28 @@ sudo cp ${PROJECT_DIR}/window_manager/resources/config/other/display_manager_con sudo cp ${PROJECT_DIR}/window_manager/resources/config/other/window_manager_config.xml /usr/local/share/ft/window_manager # ============================================================================= -# download ft thirt part files +# download ft third party files # ============================================================================= if [ ! -d ${PROJECT_DIR}/third_party/ft_flutter ]; then git clone https://gitee.com/openeuler/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter cd ${PROJECT_DIR}/third_party/ft_flutter ./project_build/prebuild.sh -./build.sh -i +./build.sh $* fi if [ ! -d ${PROJECT_DIR}/third_party/ft_multimedia ]; then git clone https://gitee.com/openeuler/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia cd ${PROJECT_DIR}/third_party/ft_multimedia -./build/prebuild.sh -./build.sh +./build/prebuild.sh $* +./build.sh $* fi if [ ! -d ${PROJECT_DIR}/third_party/ft_mmi ]; then git clone https://gitee.com/openeuler/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi cd ${PROJECT_DIR}/third_party/ft_mmi ./build/prebuild.sh -./build.sh +./build.sh $* fi cd ${PROJECT_DIR} diff --git a/display_server/drivers/hal/test/system_test/gpu_backend_test.cpp b/display_server/drivers/hal/test/system_test/gpu_backend_test.cpp index 8688995b1af64eae791fd483d947de1c2b563842..fda1756f797e00f5b583e4e03f24604bdde81a02 100644 --- a/display_server/drivers/hal/test/system_test/gpu_backend_test.cpp +++ b/display_server/drivers/hal/test/system_test/gpu_backend_test.cpp @@ -14,6 +14,7 @@ */ #include +#include #include "display_device.h" #include "event_loop/event_loop.h"