From 2be90efd979f41386929260fccbec3febb8a4b36 Mon Sep 17 00:00:00 2001 From: jichuan Date: Fri, 2 Jun 2023 15:32:57 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20OAT=E6=96=87=E4=BB=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99=E9=85=8D=E7=BD=AE=EF=BC=8Cdesc?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jichuan --- OAT.xml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/OAT.xml b/OAT.xml index 60c27912..655941f0 100644 --- a/OAT.xml +++ b/OAT.xml @@ -59,26 +59,19 @@ Note:If the text contains special characters, please escape them according to th - - - + - - - + - - - - - + + -- Gitee From 81c2f425d824c04a3d3538977d27884b513defa6 Mon Sep 17 00:00:00 2001 From: jichuan Date: Fri, 2 Jun 2023 16:38:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20build.sh=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E5=9C=A8=E4=BB=BB=E6=84=8F=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=8F=AF=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jichuan --- trace_streamer/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/trace_streamer/build.sh b/trace_streamer/build.sh index 96965a67..fbf80133 100755 --- a/trace_streamer/build.sh +++ b/trace_streamer/build.sh @@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. set -e + +cd $(dirname ${BASH_SOURCE}) + PARAMS=$* echo $PARAMS echo "begin to check input" -- Gitee From 3055afc873bf09950b2a6a2b2037855010ec4dfe Mon Sep 17 00:00:00 2001 From: jichuan Date: Fri, 2 Jun 2023 17:10:35 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E4=B8=89=E6=96=B9=E5=BA=93=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=B9=E5=BC=8F=E4=BB=8Egit->https?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jichuan --- trace_streamer/pare_third_party.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/trace_streamer/pare_third_party.sh b/trace_streamer/pare_third_party.sh index 6d1fb283..ba30ed9c 100755 --- a/trace_streamer/pare_third_party.sh +++ b/trace_streamer/pare_third_party.sh @@ -26,7 +26,7 @@ cd third_party if [ ! -f "sqlite/BUILD.gn" ];then rm -rf sqlite - git clone git@gitee.com:openharmony/third_party_sqlite.git + git clone https://gitee.com/openharmony/third_party_sqlite.git if [ -d "third_party_sqlite" ];then mv third_party_sqlite sqlite $cp ../prebuilts/patch_sqlite/sqlite3build.gn ../third_party/sqlite/BUILD.gn @@ -36,7 +36,7 @@ if [ ! -f "sqlite/BUILD.gn" ];then fi if [ ! -f "protobuf/BUILD.gn" ];then rm -rf protobuf - git clone git@gitee.com:openharmony/third_party_protobuf.git + git clone https://gitee.com/openharmony/third_party_protobuf.git if [ -d "third_party_protobuf" ];then mv third_party_protobuf protobuf $cp ../prebuilts/patch_protobuf/protobufbuild.gn ../third_party/protobuf/BUILD.gn @@ -47,7 +47,7 @@ fi if [ ! -f "googletest/BUILD.gn" ];then rm -rf googletest - git clone git@gitee.com:openharmony/third_party_googletest.git + git clone https://gitee.com/openharmony/third_party_googletest.git if [ -d "third_party_googletest" ];then mv third_party_googletest googletest $cp ../prebuilts/patch_googletest/googletestbuild.gn ../third_party/googletest/BUILD.gn @@ -63,7 +63,7 @@ fi if [ ! -f "json-master/BUILD.gn" ];then rm -rf json-master - git clone git@gitee.com:openharmony/third_party_json.git + git clone https://gitee.com/openharmony/third_party_json.git if [ -d "third_party_json" ];then mv third_party_json json-master else @@ -73,7 +73,7 @@ fi if [ ! -f "libunwind/BUILD.gn" ];then rm -rf libunwind - git clone git@gitee.com:openharmony/third_party_libunwind.git + git clone https://gitee.com/openharmony/third_party_libunwind.git if [ -d "third_party_libunwind" ];then mv third_party_libunwind libunwind $cp ../prebuilts/patch_libunwind/libunwindbuild.gn libunwind/BUILD.gn @@ -99,7 +99,7 @@ fi if [ ! -f "hiperf/BUILD.gn" ];then rm -rf hiperf developtools_hiperf - git clone -b OpenHarmony-3.2-Release --depth=1 git@gitee.com:openharmony/developtools_hiperf.git + git clone -b OpenHarmony-3.2-Release --depth=1 https://gitee.com/openharmony/developtools_hiperf.git if [ -d "developtools_hiperf" ];then mv developtools_hiperf hiperf $cp ../prebuilts/patch_hiperf/BUILD.gn ../third_party/hiperf/BUILD.gn -- Gitee From d75b4d8cf672c59d5fe9ea5da99c048336efc672 Mon Sep 17 00:00:00 2001 From: jichuan Date: Fri, 2 Jun 2023 17:27:50 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E4=B8=89=E6=96=B9=E5=BA=93=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=B9=E5=BC=8F=E4=BB=8Egit->https?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jichuan --- trace_streamer/dl_tools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trace_streamer/dl_tools.sh b/trace_streamer/dl_tools.sh index 02e12b16..5226173b 100755 --- a/trace_streamer/dl_tools.sh +++ b/trace_streamer/dl_tools.sh @@ -22,7 +22,7 @@ if [ ! -f "prebuilts/$gn_path/gn" ];then fi if [ ! -d "tools/public_tools" ];then cd tools - git clone git@gitee.com:su_ze1688/public_tools.git + git clone https://gitee.com/su_ze1688/public_tools.git cd .. mv tools/public_tools/gn/$gn_path/gn prebuilts/$gn_path mv tools/public_tools/gn/$gn_path/ninja prebuilts/$gn_path/ninja -- Gitee From 8c5aecbb7f8a5692121ed3f8b56924ad96693a4c Mon Sep 17 00:00:00 2001 From: jichuan Date: Mon, 5 Jun 2023 10:07:16 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E6=B5=81=E6=B0=B4=E7=BA=BF=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=B7=A5=E5=85=B7=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jichuan --- trace_streamer/gn/toolchain/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trace_streamer/gn/toolchain/BUILD.gn b/trace_streamer/gn/toolchain/BUILD.gn index 3b315094..ebae1b68 100755 --- a/trace_streamer/gn/toolchain/BUILD.gn +++ b/trace_streamer/gn/toolchain/BUILD.gn @@ -15,7 +15,7 @@ import("//gn/wasm.gni") declare_args() { if (target_os == "linux" || target_os == "macx") { cc = "/usr/bin/clang" - cxx = "/usr/bin/clang++" + cxx = "/home/tools/llvm/bin/clang++" pic = "-fPIC" rebuild_string = "" extra_asmflags = "" -- Gitee From bc76e1bb6484fb08e24138f168f11a318d7291b0 Mon Sep 17 00:00:00 2001 From: jichuan Date: Mon, 5 Jun 2023 10:32:29 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E6=B5=81=E6=B0=B4=E7=BA=BF=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=B7=A5=E5=85=B7=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jichuan --- trace_streamer/gn/toolchain/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trace_streamer/gn/toolchain/BUILD.gn b/trace_streamer/gn/toolchain/BUILD.gn index ebae1b68..f44e8270 100755 --- a/trace_streamer/gn/toolchain/BUILD.gn +++ b/trace_streamer/gn/toolchain/BUILD.gn @@ -14,7 +14,7 @@ import("//gn/wasm.gni") declare_args() { if (target_os == "linux" || target_os == "macx") { - cc = "/usr/bin/clang" + cc = "/home/tools/llvm/bin/clang" cxx = "/home/tools/llvm/bin/clang++" pic = "-fPIC" rebuild_string = "" -- Gitee From 2e849b54ae2aab85f28a2fe5b2efae37abafc439 Mon Sep 17 00:00:00 2001 From: jichuan Date: Mon, 5 Jun 2023 10:48:33 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E6=B5=81=E6=B0=B4=E7=BA=BF=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=B7=A5=E5=85=B7=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jichuan --- trace_streamer/gn/toolchain/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trace_streamer/gn/toolchain/BUILD.gn b/trace_streamer/gn/toolchain/BUILD.gn index f44e8270..4378f5b9 100755 --- a/trace_streamer/gn/toolchain/BUILD.gn +++ b/trace_streamer/gn/toolchain/BUILD.gn @@ -19,7 +19,7 @@ declare_args() { pic = "-fPIC" rebuild_string = "" extra_asmflags = "" - asm = "/usr/bin/clang" + asm = "/home/tools/llvm/bin/clang" } else if (target_os == "windows") { cc = "gcc.exe" cxx = "g++.exe" -- Gitee