From 878fab37db477ae9127aa5c203dcce2f5b58fd52 Mon Sep 17 00:00:00 2001 From: lixiang Date: Wed, 16 Aug 2023 16:25:45 +0800 Subject: [PATCH] modify ohos_build for compile Signed-off-by: lixiang --- .gitignore | 4 ++++ build/config/ohos/config.gni | 4 ++-- buildtools/clang_format/script | 1 - buildtools/third_party/libc++/trunk | 1 - buildtools/third_party/libc++abi/trunk | 1 - buildtools/third_party/libunwind/trunk | 1 - docs/website | 1 - huawei/build/hap/build_hap.py | 2 +- ohos_build/build.sh | 4 ++-- ohos_build/{ => build}/config/ohos.json | 0 ohos_build/{ => build}/config_to_gn.py | 0 ohos_build/config/default.json | 16 ---------------- tools/page_cycler/acid3 | 1 - 13 files changed, 9 insertions(+), 27 deletions(-) delete mode 160000 buildtools/clang_format/script delete mode 160000 buildtools/third_party/libc++/trunk delete mode 160000 buildtools/third_party/libc++abi/trunk delete mode 160000 buildtools/third_party/libunwind/trunk delete mode 160000 docs/website rename ohos_build/{ => build}/config/ohos.json (100%) rename ohos_build/{ => build}/config_to_gn.py (100%) delete mode 100755 ohos_build/config/default.json delete mode 160000 tools/page_cycler/acid3 diff --git a/.gitignore b/.gitignore index ad7e70f7fe..c97814667d 100644 --- a/.gitignore +++ b/.gitignore @@ -82,6 +82,10 @@ vs-chromium-project.txt #/ash/webui/media_app_ui/resources/pkg #/ash/webui/projector_app/resources/prod #/base/base_unittests_run.xml +/buildtools/clang_format/script +/buildtools/third_party/libc++/trunk +/buildtools/third_party/libc++abi/trunk +/buildtools/third_party/libunwind/trunk # See build/.gitignore for entries covering src/build. # The Chrome OS build creates a /c and /c_icu symlink due to http://crbug.com/54866. diff --git a/build/config/ohos/config.gni b/build/config/ohos/config.gni index a50595260c..deb5ea6e83 100755 --- a/build/config/ohos/config.gni +++ b/build/config/ohos/config.gni @@ -99,8 +99,8 @@ if (is_ohos) { } if (use_ohos_sdk_sysroot) { - import("//ohos_sdk/ohos_sdk.gni") - ohos_sdk_root = "//ohos_sdk" + import("//third_party/ohos_sdk/ohos_sdk.gni") + ohos_sdk_root = "//third_party/ohos_sdk" ohos_sysroot = "$ohos_sdk_root/native/$ohos_sdk_version/sysroot/" } diff --git a/buildtools/clang_format/script b/buildtools/clang_format/script deleted file mode 160000 index 13278ee804..0000000000 --- a/buildtools/clang_format/script +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 13278ee804b73f95ec3c4a5cb0ffb435b33cfd1d diff --git a/buildtools/third_party/libc++/trunk b/buildtools/third_party/libc++/trunk deleted file mode 160000 index 6c0cf9c3eb..0000000000 --- a/buildtools/third_party/libc++/trunk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6c0cf9c3eb7110a11bf65fb4aa214c4294db42e9 diff --git a/buildtools/third_party/libc++abi/trunk b/buildtools/third_party/libc++abi/trunk deleted file mode 160000 index 94e15d00ce..0000000000 --- a/buildtools/third_party/libc++abi/trunk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 94e15d00ce0ceeb9551051bbede849bc36fb92d8 diff --git a/buildtools/third_party/libunwind/trunk b/buildtools/third_party/libunwind/trunk deleted file mode 160000 index 89788feeb0..0000000000 --- a/buildtools/third_party/libunwind/trunk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 89788feeb0b4f7d9f8f225e231d121c038b097ca diff --git a/docs/website b/docs/website deleted file mode 160000 index 4b7b02d27f..0000000000 --- a/docs/website +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4b7b02d27ffd78ff2dd918287ecce32dbbc6f76b diff --git a/huawei/build/hap/build_hap.py b/huawei/build/hap/build_hap.py index bd60829e1c..7d724a1339 100644 --- a/huawei/build/hap/build_hap.py +++ b/huawei/build/hap/build_hap.py @@ -191,7 +191,7 @@ def main(): help='Path to the root director of HAP project', required=False) parser.add_argument('--sdk-root', - default=os.path.join(project_root, '../ohos_sdk/'), + default=os.path.join(project_root, '../third_party/ohos_sdk/'), help='Path to the root director of OHOS SDK', required=False) parser.add_argument('--node-root', diff --git a/ohos_build/build.sh b/ohos_build/build.sh index 1f05882aac..e350b7f7f7 100755 --- a/ohos_build/build.sh +++ b/ohos_build/build.sh @@ -222,8 +222,8 @@ else fi # Extract ohos-sdk. -if [ -f "src/ohos_sdk/.install" ]; then - bash "src/ohos_sdk/.install" +if [ -f "src/third_party/ohos_sdk/.install" ]; then + bash "src/third_party/ohos_sdk/.install" if [ $? -ne 0 ]; then echo "ERROR: Failed to install ohos-sdk, abort!" exit 1 diff --git a/ohos_build/config/ohos.json b/ohos_build/build/config/ohos.json similarity index 100% rename from ohos_build/config/ohos.json rename to ohos_build/build/config/ohos.json diff --git a/ohos_build/config_to_gn.py b/ohos_build/build/config_to_gn.py similarity index 100% rename from ohos_build/config_to_gn.py rename to ohos_build/build/config_to_gn.py diff --git a/ohos_build/config/default.json b/ohos_build/config/default.json deleted file mode 100755 index acbbdb0428..0000000000 --- a/ohos_build/config/default.json +++ /dev/null @@ -1,16 +0,0 @@ -{ "name": "OHOS_ENABLE_DRAG_DROP", - "owner": "", - "desc": "drag and drop", - "effect":"main gn blink_core other", - "genCommandline": "default", - "dependence": "", - "default": "true" -}, -{ "name": "OHOS_NWEB_EX", - "owner": "", - "desc": "config isolation for origin code", - "effect":"main gn blink_core other", - "genCommandline": "default", - "dependence": "", - "default": "true" -} \ No newline at end of file diff --git a/tools/page_cycler/acid3 b/tools/page_cycler/acid3 deleted file mode 160000 index 224dedb21f..0000000000 --- a/tools/page_cycler/acid3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 224dedb21f88e50412aa85e578d6c26e62e62a7d -- Gitee