diff --git a/build/prebuild.sh b/build/prebuild.sh index 0c8ead31ace7625fb0f0da2fba746ce3664709ac..d0f316fc80ee144fc4d4280d41b2b5824aafd1e2 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -118,21 +118,21 @@ sudo cp ${PROJECT_DIR}/window_manager/resources/config/other/window_manager_conf # ============================================================================= if [ ! -d ${PROJECT_DIR}/third_party/ft_flutter ]; then -git clone https://gitee.com/openeuler/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter +git clone https://gitee.com/openeuler/ft_flutter.git -b weekly_20231012 ${PROJECT_DIR}/third_party/ft_flutter fi cd ${PROJECT_DIR}/third_party/ft_flutter ./project_build/prebuild.sh ./build.sh $* if [ ! -d ${PROJECT_DIR}/third_party/ft_multimedia ]; then -git clone https://gitee.com/openeuler/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia +git clone https://gitee.com/openeuler/ft_multimedia.git -b weekly_20231012 ${PROJECT_DIR}/third_party/ft_multimedia fi cd ${PROJECT_DIR}/third_party/ft_multimedia ./build/prebuild.sh $* ./build.sh $* if [ ! -d ${PROJECT_DIR}/third_party/ft_mmi ]; then -git clone https://gitee.com/openeuler/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi +git clone https://gitee.com/openeuler/ft_mmi.git -b weekly_20231012 ${PROJECT_DIR}/third_party/ft_mmi fi cd ${PROJECT_DIR}/third_party/ft_mmi ./build/prebuild.sh diff --git a/display_server/drivers/hal/base/src/timestamp.cpp b/display_server/drivers/hal/base/src/timestamp.cpp index 113721839142cdc3a7fa719f6c0bd7616ff67707..d1f7cf3a997b29ad4658247115ed7a1ca4540def 100644 --- a/display_server/drivers/hal/base/src/timestamp.cpp +++ b/display_server/drivers/hal/base/src/timestamp.cpp @@ -31,7 +31,7 @@ TimeType SteadyClockMicroSeconds() } // Class std::chrono::system_clock represents the system-wide real time wall clock. -// It may not be monotonic: on most systems, the system time can be adjusted at any mo/ment. +// It may not be monotonic: on most systems, the system time can be adjusted at any moment. TimeType SystemClockMicroSeconds() { auto tp = std::chrono::time_point_cast(std::chrono::system_clock::now());