From 805d41a90dbc8f0dc1d1740a40035aeb41d57ed3 Mon Sep 17 00:00:00 2001 From: MaxGroshev Date: Sat, 3 May 2025 21:36:45 +0300 Subject: [PATCH] Adding aarch64 build Issue: https://gitee.com/openharmony/arkcompiler_toolchain/issues/IC5F0K Tests: ninja all tests Change-Id: If2ac356d54178f786877416c59a3688a815b3871 Signed-off-by: groshevmaksim --- build/compile_script/ark.py | 10 +++++++++- build/prebuilts_download/prebuilts_download.sh | 3 +++ .../prebuilts_download_config.json | 18 +++++++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/build/compile_script/ark.py b/build/compile_script/ark.py index 60035a4c..2ccd7c01 100755 --- a/build/compile_script/ark.py +++ b/build/compile_script/ark.py @@ -118,6 +118,14 @@ class ArkPy: "gn_args": ["target_os=\"linux\"", "target_cpu=\"x86\""], "prefix_of_name_of_out_dir_of_second_level": "x86", }, + "linux_arm64": { + "flags": ["linux_arm64"], + "description": + "Build for arkcompiler target of target-operating-system linux and " + "target-central-processing-unit arm64.", + "gn_args": ["target_os=\"linux\"", "target_cpu=\"arm64\""], + "prefix_of_name_of_out_dir_of_second_level": "linux_arm64", + }, "ohos_arm": { "flags": ["ohos_arm", "arm"], "description": @@ -132,7 +140,7 @@ class ArkPy: "Build for arkcompiler target of target-operating-system ohos and " "target-central-processing-unit arm64.", "gn_args": ["target_os=\"ohos\"", "target_cpu=\"arm64\""], - "prefix_of_name_of_out_dir_of_second_level": "arm64", + "prefix_of_name_of_out_dir_of_second_level": "ohos_arm64", }, "android_arm64": { "flags": ["android_arm64"], diff --git a/build/prebuilts_download/prebuilts_download.sh b/build/prebuilts_download/prebuilts_download.sh index 3d0844f9..070646bc 100755 --- a/build/prebuilts_download/prebuilts_download.sh +++ b/build/prebuilts_download/prebuilts_download.sh @@ -67,6 +67,9 @@ case $(uname -m) in host_cpu=arm64 ;; + aarch64) + host_cpu=aarch64 + ;; *) host_cpu=x86_64 esac diff --git a/build/prebuilts_download/prebuilts_download_config.json b/build/prebuilts_download/prebuilts_download_config.json index c2091efa..7dd359a8 100644 --- a/build/prebuilts_download/prebuilts_download_config.json +++ b/build/prebuilts_download/prebuilts_download_config.json @@ -9,6 +9,13 @@ "symlink_src": "/lib/clang/15.0.4", "symlink_dest": "/lib/clang/current" }, + { + "src": "/prebuilts/clang/ohos/linux-aarch64/clang_linux-aarch64-c2f890-20241211", + "dest": "/prebuilts/clang/ohos/linux-aarch64/llvm", + "rename": "true", + "symlink_src": "/lib/clang/15.0.4", + "symlink_dest": "/lib/clang/current" + }, { "src": "/prebuilts/clang/ohos/darwin-arm64/clang_darwin-arm64-ef68e8-20240229", "dest": "/prebuilts/clang/ohos/darwin-arm64/llvm", @@ -53,25 +60,34 @@ "copy_config": [ { "unzip_dir": "prebuilts/build-tools/linux-aarch64/bin", + "file_path": "/openharmony/compiler/gn/20240130/linux/gn-linux-aarch64-20240130.tar.gz", "unzip_filename": "gn" }, { "unzip_dir": "prebuilts/build-tools/linux-aarch64/bin", + "file_path": "/openharmony/compiler/ninja/1.11.0/linux/ninja-linux-aarch64-1.11.0.tar.gz", "unzip_filename": "ninja" }, { "unzip_dir": "prebuilts/ark_tools", + "file_path": "/openharmony/compiler/llvm_prebuilt_libs/ark_js_prebuilts_20231215.tar.gz", "unzip_filename": "ark_js_prebuilts" } ], "linux_copy_config": [ { "unzip_dir": "prebuilts/clang/ohos/linux-aarch64", + "file_path": "/openharmony/compiler/clang/15.0.4-c2f890/linux_aarch64/clang_linux-aarch64-c2f890-20241211.tar.gz", + "unzip_filename": "llvm" + }, + { + "unzip_dir": "prebuilts/clang/ohos/linux-x86_64", + "file_path": "/openharmony/compiler/clang/15.0.4-ef68e8/linux/clang_linux-x86_64-ef68e8-20240229.tar.gz", "unzip_filename": "llvm" } ] } - }, + }, "darwin": { "arm64": { "copy_config": [ -- Gitee