diff --git a/OAT.xml b/OAT.xml index 60c27912c6b43d6d2f4aeb7aec3b4f5fca7fea3e..655941f073f2ef801b91b5a20a66363cc8834e93 100644 --- a/OAT.xml +++ b/OAT.xml @@ -59,26 +59,19 @@ Note:If the text contains special characters, please escape them according to th - - - + - - - + - - - - - + + diff --git a/trace_streamer/build.sh b/trace_streamer/build.sh index 96965a670d46f5a8e3fc812fb8aafccc4e3a19ac..fbf80133394990b202f901b8eba0efb51a256932 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" diff --git a/trace_streamer/dl_tools.sh b/trace_streamer/dl_tools.sh index 02e12b1699ce79508f64e4226b89bb94fa675c4c..5226173b275793d3ddf79cd665361223219c03d8 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 diff --git a/trace_streamer/gn/toolchain/BUILD.gn b/trace_streamer/gn/toolchain/BUILD.gn index 3b31509464aa0660a9b73a9d08b4865bff5d292d..4378f5b9645397b07bd87f8cfb93875fc49b62de 100755 --- a/trace_streamer/gn/toolchain/BUILD.gn +++ b/trace_streamer/gn/toolchain/BUILD.gn @@ -14,12 +14,12 @@ import("//gn/wasm.gni") declare_args() { if (target_os == "linux" || target_os == "macx") { - cc = "/usr/bin/clang" - cxx = "/usr/bin/clang++" + cc = "/home/tools/llvm/bin/clang" + cxx = "/home/tools/llvm/bin/clang++" 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" diff --git a/trace_streamer/pare_third_party.sh b/trace_streamer/pare_third_party.sh index 6d1fb283761890e83b2f66eda3eb493a71575b75..ba30ed9cd450dee48ec3df65e5b12ff7529411f4 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