From fb2c5be9c38eae0e8388c82c44ffd39824f129d0 Mon Sep 17 00:00:00 2001 From: gaojiazhen Date: Thu, 12 Oct 2023 08:00:53 +0000 Subject: [PATCH 1/2] =?UTF-8?q?update=20display=5Fserver/drivers/hal/base/?= =?UTF-8?q?src/timestamp.cpp.=20=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=AC=94=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gaojiazhen --- display_server/drivers/hal/base/src/timestamp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/display_server/drivers/hal/base/src/timestamp.cpp b/display_server/drivers/hal/base/src/timestamp.cpp index 1137218..d1f7cf3 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()); -- Gitee From f8720772f53acc4e6ac80652a122e27f67e1a09a Mon Sep 17 00:00:00 2001 From: xieyijun3 Date: Thu, 12 Oct 2023 21:58:26 +0800 Subject: [PATCH 2/2] modify deps branch Signed-off-by: x30034819 Signed-off-by: xieyijun3 --- build/prebuild.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/prebuild.sh b/build/prebuild.sh index 0c8ead3..d0f316f 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 -- Gitee