From 4b9db95f7dd6e02525706a552a8df02014aa049e Mon Sep 17 00:00:00 2001
From: hezhengyi <ssyzesb@qq.com>
Date: Wed, 20 Dec 2023 11:48:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9engine=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC,=E6=94=AF=E6=8C=81=E7=BC=96=E8=AF=91flutter?=
 =?UTF-8?q?=5Fembedding.har=E5=88=B0engine=E4=BA=A7=E7=89=A9=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84ohos=E7=9B=AE=E5=BD=95=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hezhengyi <ssyzesb@qq.com>
---
 README.en.md                                  |  18 +-
 README.md                                     |  17 +-
 attachment/repos/bootstrap/clean.bat          |  16 -
 attachment/repos/bootstrap/{clean.sh => ohos} |   7 +-
 attachment/repos/bootstrap/ohos.bat           |   6 +-
 attachment/repos/bootstrap/ohos.py            | 366 ++++++++++++++++++
 attachment/repos/bootstrap/ohos.sh            | 116 ------
 attachment/repos/bootstrap/update_engine.bat  |  17 -
 attachment/repos/bootstrap/update_engine.sh   |  17 -
 .../hvigor-dependencies-config.md             |   4 +
 .../hvigor/hvigor-config.json5                |  13 +-
 11 files changed, 404 insertions(+), 193 deletions(-)
 delete mode 100644 attachment/repos/bootstrap/clean.bat
 rename attachment/repos/bootstrap/{clean.sh => ohos} (88%)
 mode change 100644 => 100755
 create mode 100644 attachment/repos/bootstrap/ohos.py
 delete mode 100755 attachment/repos/bootstrap/ohos.sh
 delete mode 100644 attachment/repos/bootstrap/update_engine.bat
 delete mode 100644 attachment/repos/bootstrap/update_engine.sh
 create mode 100644 shell/platform/ohos/flutter_embedding/dependencies/hvigor-dependencies-config.md

diff --git a/README.en.md b/README.en.md
index 94cbad4522..1200950bbe 100644
--- a/README.en.md
+++ b/README.en.md
@@ -20,7 +20,6 @@ This warehouse is based on the extension of Flutter's official engine warehouse
 
    ```
     sudo apt install python3
-    sudo apt install make
     sudo apt install pkg-config
     sudo apt install ninja-build
    ```
@@ -53,19 +52,22 @@ This warehouse is based on the extension of Flutter's official engine warehouse
 
 3. Synchronize code: In the engine directory, execute `gclient sync`; here the engine source code, official packages repository will be synchronized, and the ohos_setup task will be executed;
 
-4. Download sdk: Download ohos-sdk-full in [the daily build](http://ci.openharmony.cn/workbench/cicd/dailybuild/dailylist), create a new folder ndk/linux/4.0 in the engine root directory, unzip the native folder in ohos-sdk-full and place it in ndk/linux/4.0 in folder;
-(For mac environment, please download mac-sdk-full or mac-sdk-m1-full, and the placement directory is ndk/mac/4.0；No need to download OpenHarmony SDK in Windows environment)
+4. Download sdk: Download ohos-sdk-full in [the daily build](http://ci.openharmony.cn/workbench/cicd/dailybuild/dailylist), configure the following environment variables:
 
-5. Start building: In the engine directory, execute `make` to start building the flutter engine that supports ohos devices.
+```sh
+export OHOS_SDK_HOME=<ohos-sdk-full>
+```
+
+5. Start building: In the engine directory, execute `./ohos` to start building the flutter engine that supports ohos devices.
    
-6. Update project: In the engine directory, execute `./update_engine.sh` (Linux/Mac platform) or `update_engine.bat` (Windows platform)
+6. Update project: In the engine directory, execute `./ohos -b master`
 
 ## FAQ:
 1. When running the project, an error of Member notfound:'isOhos' is reported: Please ensure that all dart patches are applied in the src/third_party/dart directory (the patches are located in the src/flutter/attachment/repos directory, and you can use git apply to apply the patch). Recompile the engine after patching
    
 2. Prompt Permission denied: Execute chmod +x <script file> to add execution permissions
 
-3. Compile the engine in debug/release/profile mode separately: edit ohos.sh (Linux and Mac platforms) under the config function, or ohos.bat (Windows platform) to configure the corresponding compilation mode, and execute `make`
+3. Compile the engine in debug/release/profile mode separately: `ohos -t debug|release|profile`
 
 
 ## Embedding layer code construction guide
@@ -87,4 +89,6 @@ This warehouse is based on the extension of Flutter's official engine warehouse
 
 3. The har file output path is: shell/platform/ohos/flutter_embedding/flutter/build
 
-ps: If you are using the Beta version of DevEco Studio and encounter the error "must have required property 'compatibleSdkVersion', location: build-profile.json5:17:11" when compiling the project, please refer to the "DevEco Studio Environment Configuration Guide." docx》Chapter '6 Creating Projects and Running Hello World' [Configuration Plugin] Modify the shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5 file.
\ No newline at end of file
+ps: If you are using the Beta version of DevEco Studio and encounter the error "must have required property 'compatibleSdkVersion', location: build-profile.json5:17:11" when compiling the project, please refer to the "DevEco Studio Environment Configuration Guide." docx》Chapter '6 Creating Projects and Running Hello World' [Configuration Plugin] Modify the shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5 file.
+
+[hvigor-dependencies-config](shell/platform/ohos/flutter_embedding/dependencies/hvigor-dependencies-config.md)
diff --git a/README.md b/README.md
index 4f0676fe3a..f1f84fa488 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,6 @@ Flutter Engine
 
    ```
    sudo apt install python3
-   sudo apt install make
    sudo apt install pkg-config
    sudo apt install ninja-build
    ```
@@ -54,20 +53,22 @@ Flutter Engine
 
 3. 同步代码：在engine目录，执行`gclient sync`；这里会同步engine源码、官方packages仓，还有执行ohos_setup任务；
 
-4. 下载sdk： 在[每日构建](http://ci.openharmony.cn/workbench/cicd/dailybuild/dailylist)下载ohos-sdk-full，在engine根目录下，新建文件夹 ndk/linux/4.0，解压ohos-sdk-full中的native文件夹并放置到ndk/linux/4.0文件夹中；
-(mac环境，请下载mac-sdk-full或者mac-sdk-m1-full，放置目录为ndk/mac/4.0；Windows环境无需下载鸿蒙sdk，请参考《构建基础环境》配置Windows环境)
+4. 下载sdk： 在[每日构建](http://ci.openharmony.cn/workbench/cicd/dailybuild/dailylist)下载ohos-sdk-full，配置以下环境变量:
 
+```sh
+export OHOS_SDK_HOME=<ohos-sdk-full>
+```
 
-5. 开始构建：在engine目录，执行`make`，即可开始构建支持ohos设备的flutter engine。
+5. 开始构建：在engine目录，执行`./ohos`，即可开始构建支持ohos设备的flutter engine。
    
-6. 更新代码：在engine目录，执行`./update_engine.sh`(Linux/Mac平台)或`update_engine.bat`(Windows平台)
+6. 更新代码：在engine目录，执行`./ohos -b master`
 
 ## FAQ
 1. 运行项目工程报Member notfound:'isOhos'的错误：请确保src/third_party/dart目录下应用了所有的dart patch（补丁位于src/flutter/attachment/repos目录，可使用git apply应用patch）应用patch后重新编译engine
 
 2. 提示Permission denied: 执行chmod +x <脚本文件> 添加执行权限
 
-3. 单独编译debug/release/profile模式的engine：编辑ohos.sh(Linux和Mac平台)在config函数下，或ohos.bat(Windows平台)配置对应的编译模式，执行`make`
+3. 单独编译debug/release/profile模式的engine：`./ohos -t debug|release|profile`
 
 ## embedding层代码构建指导
 
@@ -86,4 +87,6 @@ Flutter Engine
 
 3. har文件输出路径为：shell/platform/ohos/flutter_embedding/flutter/build
 
-ps:如果你使用的是DevEco Studio的Beta版本，编译工程时遇到“must have required property 'compatibleSdkVersion', location: build-profile.json5:17:11"错误，请参考《DevEco Studio环境配置指导.docx》中的‘6 创建工程和运行Hello World’【配置插件】章节修改 shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5文件。
\ No newline at end of file
+ps:如果你使用的是DevEco Studio的Beta版本，编译工程时遇到“must have required property 'compatibleSdkVersion', location: build-profile.json5:17:11"错误，请参考《DevEco Studio环境配置指导.docx》中的‘6 创建工程和运行Hello World’【配置插件】章节修改 shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5文件。
+
+[hvigor本地依赖配置](shell/platform/ohos/flutter_embedding/dependencies/hvigor-dependencies-config.md)
diff --git a/attachment/repos/bootstrap/clean.bat b/attachment/repos/bootstrap/clean.bat
deleted file mode 100644
index 9f3374673c..0000000000
--- a/attachment/repos/bootstrap/clean.bat
+++ /dev/null
@@ -1,16 +0,0 @@
-@rem Copyright (c) 2021-2023 Huawei Device Co., Ltd.
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem     http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-
-@echo off
-
-rmdir /s/q "src\out\"
diff --git a/attachment/repos/bootstrap/clean.sh b/attachment/repos/bootstrap/ohos
old mode 100644
new mode 100755
similarity index 88%
rename from attachment/repos/bootstrap/clean.sh
rename to attachment/repos/bootstrap/ohos
index eb2b84ac81..1dc5bd90f6
--- a/attachment/repos/bootstrap/clean.sh
+++ b/attachment/repos/bootstrap/ohos
@@ -1,3 +1,4 @@
+#! /bin/bash
 # Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -10,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#! /bin/bash
+#
+#编译依赖
+#sudo apt install g++-multilib git python3 curl
 
-rm -rf src/out
+python3 ohos.py $@
diff --git a/attachment/repos/bootstrap/ohos.bat b/attachment/repos/bootstrap/ohos.bat
index 45d771d6ec..fc87641922 100644
--- a/attachment/repos/bootstrap/ohos.bat
+++ b/attachment/repos/bootstrap/ohos.bat
@@ -14,8 +14,4 @@
 @echo off
 setlocal EnableDelayedExpansion
 
-call python .\src\flutter\tools\gn --unoptimized --runtime-mode=debug --ohos --ohos-cpu=arm64
-call python .\src\flutter\tools\gn --runtime-mode=release --ohos --ohos-cpu=arm64
-ninja -C .\src\out\ohos_debug_unopt_arm64
-ninja -C .\src\out\ohos_release_arm64
-
+python3 ohos.py %*
diff --git a/attachment/repos/bootstrap/ohos.py b/attachment/repos/bootstrap/ohos.py
new file mode 100644
index 0000000000..a36a40b539
--- /dev/null
+++ b/attachment/repos/bootstrap/ohos.py
@@ -0,0 +1,366 @@
+#!/usr/bin/env python3
+# coding=utf-8
+#
+# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import argparse
+import json
+import logging
+import os
+import platform
+import re
+import shutil
+import subprocess
+import sys
+import zipfile
+from datetime import datetime
+
+SUPPORT_BUILD_NAMES = ("clean", "config", "har", "compile", "zip")
+SUPPORT_BUILD_TYPES = ("debug", "profile", "release")
+DIR_ROOT = os.path.abspath(os.path.join(sys.argv[0], os.pardir))
+OS_NAME = platform.system().lower().replace("darwin", "mac")
+PATH_SEP = ";" if "win" in OS_NAME else ":"
+OHOS_SDK_HOME = os.getenv("OHOS_SDK_HOME")
+if not OHOS_SDK_HOME:
+    OHOS_SDK_HOME = "%s/openharmony" % os.getenv("HOS_SDK_HOME")
+
+logging.basicConfig(
+    format="%(levelname)s:%(asctime)s: %(message)s",
+    datefmt="%Y-%d-%m %H:%M:%S",
+    level=logging.DEBUG,
+)
+
+
+def safeGetPath(filePath, isDirectory=True):
+    createPath = (
+        filePath if isDirectory else os.path.abspath(os.path.join(filePath, os.pardir))
+    )
+    if not os.path.exists(createPath):
+        os.makedirs(createPath)
+    return os.path.abspath(filePath)
+
+
+DIR_OUTPUTS = safeGetPath(
+    "%s/outputs/%s" % (DIR_ROOT, datetime.now().strftime("%Y%m%d"))
+)
+DIR_LOG = safeGetPath("%s/logs" % DIR_OUTPUTS)
+
+
+class BuildInfo:
+    def __init__(
+        self,
+        buildType="release",
+        targetOS="ohos",
+        targetArch="arm64",
+        targetTriple="aarch64-linux-ohos",
+    ):
+        self.buildType = buildType
+        self.targetOS = targetOS
+        self.targetArch = targetArch
+        self.targetTriple = targetTriple
+
+    def __repr__(self):
+        return "BuildInfo(buildType=%s)" % (self.buildType)
+
+
+# 执行命令
+def runCommand(command, checkCode=True, timeout=None):
+    logging.info("runCommand start, command = %s" % (command))
+    code = subprocess.Popen(command, shell=True).wait(timeout)
+
+    if code != 0:
+        logging.error("runCommand error, code = %s, command = %s" % (code, command))
+        if checkCode:
+            exit(code)
+    else:
+        logging.info("runCommand finish, code = %s, command = %s" % (code, command))
+
+
+def getOutput(buildInfo):
+    buildType = buildInfo.buildType
+    outputName = "%s_%s%s_%s" % (
+        buildInfo.targetOS,
+        buildType,
+        "_unopt" if buildType == "debug" else "",
+        buildInfo.targetArch,
+    )
+    return outputName
+
+
+# 清理engine产物
+def engineClean(buildInfo):
+    target = os.path.join("src", "out", getOutput(buildInfo))
+    logging.info("Remove directory %s" % target)
+    if os.path.exists(target):
+        shutil.rmtree(target, ignore_errors=True)
+
+
+# 指定engine编译的配置参数
+def engineConfig(buildInfo, extraParam=""):
+    sdkInt = 9
+    for dir in os.listdir(OHOS_SDK_HOME):
+        try:
+            tmpInt = int(dir)
+            sdkInt = max(sdkInt, tmpInt)
+        except:
+            logging.warning("Parse int error, dir=%s" % dir)
+    OHOS_NDK_HOME = os.path.join(OHOS_SDK_HOME, str(sdkInt), "native")
+    logging.info("OHOS_NDK_HOME = %s" % OHOS_NDK_HOME)
+    if (
+        (not os.path.exists(OHOS_NDK_HOME))
+        or (not os.path.exists(OHOS_NDK_HOME + "/sysroot"))
+        or (not os.path.exists(OHOS_NDK_HOME + "/llvm/bin"))
+        or (not os.path.exists(OHOS_NDK_HOME + "/build-tools/cmake/bin"))
+    ):
+        logging.error(
+            """
+    Please set the environment variables for HarmonyOS SDK to "HOS_SDK_HOME" or "OHOS_SDK_HOME".
+    We will use both native/llvm and native/sysroot.
+    Please ensure that the file "llvm/bin/lang" exists and is executable."""
+        )
+        exit(10)
+
+    # export PATH=$OHOS_NDK_HOME/build-tools/cmake/bin:$OHOS_NDK_HOME/llvm/bin:$PATH
+    lastPath = os.getenv("PATH")
+    os.environ["PATH"] = (
+        "%s%s" % (os.path.join(OHOS_NDK_HOME, "build-tools", "cmake", "bin"), PATH_SEP)
+        + "%s%s" % (os.path.join(OHOS_NDK_HOME, "build-tools", "llvm", "bin"), PATH_SEP)
+        + lastPath
+    )
+
+    OPT = "--unoptimized --no-lto " if buildInfo.buildType == "debug" else ""
+    runCommand(
+        "%s " % os.path.join("src", "flutter", "tools", "gn")
+        + "--target-sysroot %s " % os.path.join(OHOS_NDK_HOME, "sysroot")
+        + "--target-toolchain %s " % os.path.join(OHOS_NDK_HOME, "llvm")
+        + "--target-triple %s " % buildInfo.targetTriple
+        + "--ohos "
+        + "--ohos-cpu %s " % buildInfo.targetArch
+        + "--runtime-mode %s " % buildInfo.buildType
+        + OPT
+        + "--no-goma "
+        + "--no-prebuilt-dart-sdk "
+        + "--embedder-for-target "
+        + "--disable-desktop-embeddings "
+        + "--no-build-embedder-examples "
+        + "--enable-unittests "
+        + "--verbose "
+        + extraParam,
+        checkCode=False,
+        timeout=600,
+    )
+
+
+# 执行engine编译操作
+def engineCompile(buildInfo):
+    runCommand("ninja -C %s" % os.path.join("src", "out", getOutput(buildInfo)))
+
+
+# 替换文件中的字符串
+def replaceStr(file, regex, newstr):
+    with open(file, "r", encoding="utf-8") as f1:
+        lines = f1.readlines()
+    with open(file, "w+", encoding="utf-8") as f2:
+        for line in lines:
+            a = re.sub(regex, newstr, line)
+            f2.writelines(a)
+
+
+# 编译har文件
+def harBuild(buildInfo):
+    buildType = buildInfo.buildType
+    isDebug = "true" if buildType == "debug" else "false"
+    isProfile = "true" if buildType == "profile" else "false"
+    dirEmbedding = os.path.abspath(
+        "%s/src/flutter/shell/platform/ohos/flutter_embedding" % DIR_ROOT
+    )
+    targetFile = os.path.abspath(
+        "%s/flutter/src/main/ets/embedding/engine/loader/FlutterApplicationInfo.ets"
+        % dirEmbedding
+    )
+    logging.info("isDebugMode=%s, isProfile=%s" % (isDebug, isProfile))
+    replaceStr(targetFile, "isDebugMode = .*", "isDebugMode = %s;" % isDebug)
+    replaceStr(targetFile, "isProfile = .*", "isProfile = %s;" % isProfile)
+    runCommand(
+        ("cd %s && " % dirEmbedding)
+        + (".%s" % os.sep)
+        + "hvigorw --mode module -p module=flutter@default -p product=default assembleHar --no-daemon"
+        + " && cd %s" % DIR_ROOT
+    )
+    fileSrc = os.path.abspath(
+        "%s/flutter/build/default/outputs/default/flutter.har" % (dirEmbedding)
+    )
+    fileDest = safeGetPath(
+        "%s/src/out/%s/ohos/flutter_embedding.har" % (DIR_ROOT, getOutput(buildInfo)),
+        isDirectory=False,
+    )
+    shutil.copy(fileSrc, fileDest)
+    logging.info(
+        "Copy result is %s, from %s to %s"
+        % (os.path.exists(fileDest), fileSrc, fileDest)
+    )
+
+
+def isPathValid(filepath, filename, includeDir, excludeDir):
+    for dir in includeDir:
+        if dir in filepath:
+            return True
+    if includeDir != []:
+        return False
+    for dir in excludeDir:
+        if dir in filepath:
+            return False
+    return True
+
+
+def zipFileDir(fileIn, fileName, prefixInZip="", includeDir=[], excludeDir=[]):
+    logging.info(
+        "fileIn= %s, fileName= %s, prefixInZip= %s, includeDir= %s, excludeDir= %s"
+        % (fileIn, fileName, prefixInZip, includeDir, excludeDir)
+    )
+    fileOut1 = os.path.abspath("%s/%s.zip" % (DIR_OUTPUTS, fileName))
+    fileOut2 = os.path.abspath("%s/%s-unstripped.zip" % (DIR_OUTPUTS, fileName))
+    with zipfile.ZipFile(fileOut1, "w", zipfile.ZIP_DEFLATED) as zip1:
+        with zipfile.ZipFile(fileOut2, "w", zipfile.ZIP_DEFLATED) as zip2:
+            for path, dirnames, filenames in os.walk(fileIn):
+                fpath = path.replace(fileIn, "")[1:]
+                pPath = prefixInZip + os.sep + fpath
+                for filename in filenames:
+                    if isPathValid(fpath, filename, includeDir, excludeDir):
+                        zip1.write(
+                            os.path.join(path, filename), os.path.join(pPath, filename)
+                        )
+                    else:
+                        zip2.write(
+                            os.path.join(path, filename), os.path.join(pPath, filename)
+                        )
+
+
+def zipFiles(buildInfo):
+    logging.info("zipFiles buildInfo=%s" % buildInfo)
+    outputName = getOutput(buildInfo)
+    fileIn = os.path.abspath("%s/src/out/%s" % (DIR_ROOT, outputName))
+    fileName = "%s-%s-%s-%s" % (
+        outputName,
+        datetime.now().strftime("%H%M"),
+        OS_NAME,
+        platform.machine(),
+    )
+    prefixInZip = os.path.join("src", "out", outputName)
+    dirArray = ["obj", "exe.unstripped", "so.unstripped"]
+    zipFileDir(fileIn, fileName, prefixInZip, excludeDir=dirArray)
+
+
+def stashChanges():
+    dir_root = "src/flutter/attachment"
+    config_file = "%s/scripts/config.json" % dir_root
+    cache = []
+    with open(config_file) as json_file:
+        data = json.load(json_file)
+        for task in data:
+            dir = os.path.join(task["target"])
+            if task["type"] == "patch" and not dir in cache:
+                cache.append(dir)
+                runCommand("git -C %s add -A" % dir)
+                runCommand("git -C %s stash save 'Auto stash save'" % dir)
+
+
+def addParseParam(parser):
+    parser.add_argument(
+        "-n",
+        "--name",
+        nargs="+",
+        default=["config", "compile", "har"],
+        choices=SUPPORT_BUILD_NAMES,
+        help="Provide build names in %s." % str(SUPPORT_BUILD_NAMES),
+    )
+    parser.add_argument(
+        "-t",
+        "--type",
+        nargs="+",
+        default=SUPPORT_BUILD_TYPES,
+        choices=SUPPORT_BUILD_TYPES,
+        help="Provide build types in %s." % str(SUPPORT_BUILD_TYPES),
+    )
+    parser.add_argument(
+        "-b",
+        "--branch",
+        help="Git branch name in src/flutter to update.",
+    )
+    parser.add_argument(
+        "-g",
+        "--gn-extra-param",
+        nargs="?",
+        default="",
+        help="Pass extra param to src/flutter/tools/gn.",
+    )
+
+
+def updateCode(args):
+    if args.branch:
+        stashChanges()
+        dir = os.path.join("src", "flutter")
+        runCommand("git -C %s add -A" % dir)
+        runCommand("git -C %s stash save 'Auto stash save.'" % dir)
+        runCommand("git -C %s checkout %s" % (dir, args.branch))
+        runCommand("git -C %s pull --rebase" % dir)
+        runCommand("git -C %s stash pop" % dir)
+        runCommand("gclient sync --force")
+
+
+def checkEnvironment():
+    if not os.path.exists("src/flutter"):
+        logging.error(
+            "You should place the current file 'ohos.py'"
+            + " in the root directory of the 'engine' compilation."
+        )
+        exit(1)
+
+
+def buildByNameAndType(args):
+    buildNames = args.name if not args.branch else []
+    buildTypes = args.type
+    for buildType in SUPPORT_BUILD_TYPES:
+        if not buildType in buildTypes:
+            continue
+        buildInfo = BuildInfo(buildType=buildType)
+        for buildName in SUPPORT_BUILD_NAMES:
+            if not buildName in buildNames:
+                continue
+            if "clean" == buildName:
+                engineClean(buildInfo)
+            elif "config" == buildName:
+                engineConfig(buildInfo, args.gn_extra_param)
+            elif "har" == buildName:
+                harBuild(buildInfo)
+            elif "compile" == buildName:
+                engineCompile(buildInfo)
+            elif "zip" == buildName:
+                zipFiles(buildInfo)
+            else:
+                logging.warning("Other name=%s" % buildName)
+
+
+def main():
+    checkEnvironment()
+    parser = argparse.ArgumentParser()
+    addParseParam(parser)
+    args = parser.parse_args()
+    updateCode(args)
+    buildByNameAndType(args)
+    logging.info("main() finish.")
+    return 0
+
+
+exit(main())
diff --git a/attachment/repos/bootstrap/ohos.sh b/attachment/repos/bootstrap/ohos.sh
deleted file mode 100755
index 7d623708a0..0000000000
--- a/attachment/repos/bootstrap/ohos.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#! /bin/bash
-# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#编译依赖
-#sudo apt install g++-multilib git python3 curl
-
-if [[ `uname` =~ 'Darwin' ]]; then
-HOST_OS=mac
-elif [[ `uname` =~ 'Linux' ]];then
-HOST_OS=linux
-else
-HOST_OS=linux
-fi
-
-NDK_HOME=`pwd`/ndk/$HOST_OS/4.0/native
-NDK_TOOLCHAIN_CMAKE=$NDK_HOME/build/cmake/ohos.toolchain.cmake
-NDK_SDK_CMAKE=$NDK_HOME/build/cmake/sdk_native_platforms.cmake
-export PATH=$NDK_HOME/build-tools/cmake/bin:$NDK_HOME/llvm/bin:$PATH
-export PATH=$(pwd)/depot_tools/:$PATH
-
-#debug|profile|rlease
-RT_MODE="debug"
-TARGET_OS="ohos"
-TARGET_ARCH="arm64"
-OPT=" --unoptimized  --no-lto --no-goma  --no-prebuilt-dart-sdk "
-HOST_OPT=" --unoptimized  --no-lto --no-goma  "
-
-#aarch64-linux-ohos  arm-linux-ohos 
-TARGET_TRIPLE="aarch64-linux-ohos"
-OUTPUT="out/$TARGET_OS""_debug_unopt_""$TARGET_ARCH"
-
-  config_debug_env()
-  {
-    RT_MODE="debug"
-    TARGET_ARCH="arm64"
-   src/flutter/tools/gn \
-      --target-sysroot $NDK_HOME/sysroot \
-      --target-toolchain $NDK_HOME/llvm \
-      --target-triple $TARGET_TRIPLE \
-      --ohos   --ohos-cpu $TARGET_ARCH  \
-      --runtime-mode $RT_MODE $OPT \
-      --embedder-for-target \
-      --disable-desktop-embeddings --no-build-embedder-examples \
-      --verbose
-  }
-  config_profile_env()
-  {
-    RT_MODE="profile"
-    TARGET_ARCH="arm64"
-    OPT=" --no-goma  --no-prebuilt-dart-sdk "
-   src/flutter/tools/gn \
-      --target-sysroot $NDK_HOME/sysroot \
-      --target-toolchain $NDK_HOME/llvm \
-      --target-triple $TARGET_TRIPLE \
-      --ohos   --ohos-cpu $TARGET_ARCH \
-      --runtime-mode $RT_MODE $OPT \
-      --embedder-for-target \
-      --disable-desktop-embeddings --no-build-embedder-examples \
-      --verbose
-  }
-  config_release_env()
-  {
-    RT_MODE="release"
-    TARGET_OS="linux"
-    TARGET_ARCH="arm64"
-    OPT=" --no-goma  --no-prebuilt-dart-sdk "
-   src/flutter/tools/gn \
-      --target-sysroot $NDK_HOME/sysroot \
-      --target-toolchain $NDK_HOME/llvm \
-      --target-triple $TARGET_TRIPLE \
-      --ohos   --ohos-cpu $TARGET_ARCH  \
-      --runtime-mode $RT_MODE $OPT \
-      --embedder-for-target \
-      --disable-desktop-embeddings --no-build-embedder-examples \
-      --verbose
-  }
-  config_host_debug_env()
-  {
-      #--embedder-for-target  \
-    src/flutter/tools/gn  $HOST_OPT  \
-      --runtime-mode $RT_MODE  \
-      --no-dart-version-git-info  \
-      --full-dart-sdk \
-      --no-build-web-sdk \
-      --disable-desktop-embeddings --no-build-embedder-examples \
-      --verbose  --trace-gn
-  }
-
-config ()
-{
-config_debug_env 
-#  config_host_debug_env;
-#  config_profile_env
-  config_release_env
-}
-
-compile()
-{
-  #ninja -C "$OUTPUT" -j 4 && find . -name libflutter_engine.so
-  find src/out -mindepth 1 -maxdepth 1 -type d | xargs -n 1 sh -c 'ninja -C $0 || exit 255'
-}
-
-config ;
-compile ;
-
diff --git a/attachment/repos/bootstrap/update_engine.bat b/attachment/repos/bootstrap/update_engine.bat
deleted file mode 100644
index 1db3138353..0000000000
--- a/attachment/repos/bootstrap/update_engine.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-@rem Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem     http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-
-@echo off
-py -3 .\src\flutter\attachment\scripts\ohos_reverse_patch.py %1
-call  git -C .\src\flutter checkout master && git -C .\src\flutter  pull origin master
-gclient sync
\ No newline at end of file
diff --git a/attachment/repos/bootstrap/update_engine.sh b/attachment/repos/bootstrap/update_engine.sh
deleted file mode 100644
index fca1267491..0000000000
--- a/attachment/repos/bootstrap/update_engine.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#! /bin/bash
-
-python3 ./src/flutter/attachment/scripts/ohos_reverse_patch.py $1
-git -C ./src/flutter checkout master && git -C ./src/flutter  pull origin master 
-gclient sync
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/dependencies/hvigor-dependencies-config.md b/shell/platform/ohos/flutter_embedding/dependencies/hvigor-dependencies-config.md
new file mode 100644
index 0000000000..d194120df1
--- /dev/null
+++ b/shell/platform/ohos/flutter_embedding/dependencies/hvigor-dependencies-config.md
@@ -0,0 +1,4 @@
+# hvigor-dependencies-config
+
+- 此目录存放在 [hvigor-config.json5](../hvigor/hvigor-config.json5) 中依赖的文件
+- 下载地址 [dependencies](https://gitee.com/openharmony-sig/flutter_flutter/tree/master/packages/flutter_tools/templates/app_shared/ohos.tmpl/dependencies)
diff --git a/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5 b/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5
index 52c0a40dd2..7885cddc3c 100755
--- a/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5
+++ b/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5
@@ -13,9 +13,10 @@
 * limitations under the License.
 */
 
-{
-  "hvigorVersion": "2.1.1",
-  "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.1.1"
-  }
-}
+{ 
+  "hvigorVersion": "file:../dependencies/hvigor-3.0.9-s.tgz", 
+  "dependencies": { 
+    "@ohos/hvigor-ohos-plugin": "file:../dependencies/hvigor-ohos-plugin-3.0.9-s.tgz", 
+    "rollup": "file:../dependencies/rollup.tgz", 
+  } 
+ }
\ No newline at end of file
-- 
Gitee


From 80ea3f119e9fc578249dff1b031d4d38738ab48f Mon Sep 17 00:00:00 2001
From: hezhengyi <ssyzesb@qq.com>
Date: Wed, 20 Dec 2023 18:29:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0ohos.py=E7=9A=84=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=A7=A3=E6=9E=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hezhengyi <ssyzesb@qq.com>
---
 attachment/repos/bootstrap/ohos.py | 54 +++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/attachment/repos/bootstrap/ohos.py b/attachment/repos/bootstrap/ohos.py
index a36a40b539..c7d91668ec 100644
--- a/attachment/repos/bootstrap/ohos.py
+++ b/attachment/repos/bootstrap/ohos.py
@@ -29,11 +29,8 @@ from datetime import datetime
 SUPPORT_BUILD_NAMES = ("clean", "config", "har", "compile", "zip")
 SUPPORT_BUILD_TYPES = ("debug", "profile", "release")
 DIR_ROOT = os.path.abspath(os.path.join(sys.argv[0], os.pardir))
-OS_NAME = platform.system().lower().replace("darwin", "mac")
-PATH_SEP = ";" if "win" in OS_NAME else ":"
-OHOS_SDK_HOME = os.getenv("OHOS_SDK_HOME")
-if not OHOS_SDK_HOME:
-    OHOS_SDK_HOME = "%s/openharmony" % os.getenv("HOS_SDK_HOME")
+OS_NAME = platform.system().lower()
+PATH_SEP = ";" if OS_NAME.startswith("win") else ":"
 
 logging.basicConfig(
     format="%(levelname)s:%(asctime)s: %(message)s",
@@ -63,7 +60,7 @@ class BuildInfo:
         buildType="release",
         targetOS="ohos",
         targetArch="arm64",
-        targetTriple="aarch64-linux-ohos",
+        targetTriple="arm64-%s-ohos" % OS_NAME,
     ):
         self.buildType = buildType
         self.targetOS = targetOS
@@ -106,16 +103,28 @@ def engineClean(buildInfo):
         shutil.rmtree(target, ignore_errors=True)
 
 
-# 指定engine编译的配置参数
-def engineConfig(buildInfo, extraParam=""):
-    sdkInt = 9
-    for dir in os.listdir(OHOS_SDK_HOME):
-        try:
-            tmpInt = int(dir)
-            sdkInt = max(sdkInt, tmpInt)
-        except:
-            logging.warning("Parse int error, dir=%s" % dir)
-    OHOS_NDK_HOME = os.path.join(OHOS_SDK_HOME, str(sdkInt), "native")
+def getNdkHome():
+    OHOS_NDK_HOME = os.getenv("OHOS_NDK_HOME")
+    if not OHOS_NDK_HOME:
+        OHOS_SDK_HOME = os.getenv("OHOS_SDK_HOME")
+        if not OHOS_SDK_HOME:
+            OHOS_SDK_HOME = "%s/openharmony" % os.getenv("HOS_SDK_HOME")
+        sdkInt = 0
+        if os.path.exists(OHOS_SDK_HOME):
+            for dir in os.listdir(OHOS_SDK_HOME):
+                try:
+                    tmpInt = int(dir)
+                    sdkInt = max(sdkInt, tmpInt)
+                except:
+                    logging.warning("Parse int error, dir=%s" % dir)
+        if sdkInt == 0:
+            logging.error(
+                "Ohos sdkInt parse failed, please config the correct environment variable."
+                " Such as: 'export OHOS_SDK_HOME=~/ohos/sdk/openharmony'."
+            )
+            exit(20)
+        OHOS_NDK_HOME = os.path.join(OHOS_SDK_HOME, str(sdkInt), "native")
+
     logging.info("OHOS_NDK_HOME = %s" % OHOS_NDK_HOME)
     if (
         (not os.path.exists(OHOS_NDK_HOME))
@@ -127,10 +136,15 @@ def engineConfig(buildInfo, extraParam=""):
             """
     Please set the environment variables for HarmonyOS SDK to "HOS_SDK_HOME" or "OHOS_SDK_HOME".
     We will use both native/llvm and native/sysroot.
-    Please ensure that the file "llvm/bin/lang" exists and is executable."""
+    Please ensure that the file "native/llvm/bin/clang" exists and is executable."""
         )
         exit(10)
+    return OHOS_NDK_HOME
 
+
+# 指定engine编译的配置参数
+def engineConfig(buildInfo, extraParam=""):
+    OHOS_NDK_HOME = getNdkHome()
     # export PATH=$OHOS_NDK_HOME/build-tools/cmake/bin:$OHOS_NDK_HOME/llvm/bin:$PATH
     lastPath = os.getenv("PATH")
     os.environ["PATH"] = (
@@ -281,7 +295,7 @@ def addParseParam(parser):
         "-n",
         "--name",
         nargs="+",
-        default=["config", "compile", "har"],
+        default=[],
         choices=SUPPORT_BUILD_NAMES,
         help="Provide build names in %s." % str(SUPPORT_BUILD_NAMES),
     )
@@ -314,7 +328,7 @@ def updateCode(args):
         runCommand("git -C %s add -A" % dir)
         runCommand("git -C %s stash save 'Auto stash save.'" % dir)
         runCommand("git -C %s checkout %s" % (dir, args.branch))
-        runCommand("git -C %s pull --rebase" % dir)
+        runCommand("git -C %s pull --rebase" % dir, checkCode=False)
         runCommand("git -C %s stash pop" % dir)
         runCommand("gclient sync --force")
 
@@ -329,7 +343,7 @@ def checkEnvironment():
 
 
 def buildByNameAndType(args):
-    buildNames = args.name if not args.branch else []
+    buildNames = args.name if args.branch or args.name else ["config", "compile", "har"]
     buildTypes = args.type
     for buildType in SUPPORT_BUILD_TYPES:
         if not buildType in buildTypes:
-- 
Gitee


From fbbd34fc2d2d364f32b0c165b08777a9c5a1b8f9 Mon Sep 17 00:00:00 2001
From: hezhengyi <ssyzesb@qq.com>
Date: Fri, 22 Dec 2023 14:17:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0ohos.py=E5=92=8Creadme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hezhengyi <ssyzesb@qq.com>
---
 README.en.md                       |  4 +++-
 README.md                          |  2 ++
 attachment/repos/bootstrap/ohos.py | 11 +++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.en.md b/README.en.md
index 1200950bbe..1b57e89b92 100644
--- a/README.en.md
+++ b/README.en.md
@@ -67,7 +67,9 @@ export OHOS_SDK_HOME=<ohos-sdk-full>
    
 2. Prompt Permission denied: Execute chmod +x <script file> to add execution permissions
 
-3. Compile the engine in debug/release/profile mode separately: `ohos -t debug|release|profile`
+3. Compile the engine in debug/release/profile mode separately: `./ohos -t debug|release|profile`
+
+4. See help: `./ohos -h`
 
 
 ## Embedding layer code construction guide
diff --git a/README.md b/README.md
index f1f84fa488..e3b16e8ba6 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,8 @@ export OHOS_SDK_HOME=<ohos-sdk-full>
 
 3. 单独编译debug/release/profile模式的engine：`./ohos -t debug|release|profile`
 
+4. 查看帮助：`./ohos -h`
+
 ## embedding层代码构建指导
 
 1. 编辑shell/platform/ohos/flutter_embedding/local.properties：
diff --git a/attachment/repos/bootstrap/ohos.py b/attachment/repos/bootstrap/ohos.py
index c7d91668ec..8eebfcdb82 100644
--- a/attachment/repos/bootstrap/ohos.py
+++ b/attachment/repos/bootstrap/ohos.py
@@ -168,9 +168,8 @@ def engineConfig(buildInfo, extraParam=""):
         + "--embedder-for-target "
         + "--disable-desktop-embeddings "
         + "--no-build-embedder-examples "
-        + "--enable-unittests "
         + "--verbose "
-        + extraParam,
+        + extraParam.replace("\\", ""),
         checkCode=False,
         timeout=600,
     )
@@ -297,7 +296,7 @@ def addParseParam(parser):
         nargs="+",
         default=[],
         choices=SUPPORT_BUILD_NAMES,
-        help="Provide build names in %s." % str(SUPPORT_BUILD_NAMES),
+        help="Provide build names.",
     )
     parser.add_argument(
         "-t",
@@ -305,7 +304,7 @@ def addParseParam(parser):
         nargs="+",
         default=SUPPORT_BUILD_TYPES,
         choices=SUPPORT_BUILD_TYPES,
-        help="Provide build types in %s." % str(SUPPORT_BUILD_TYPES),
+        help="Provide build types.",
     )
     parser.add_argument(
         "-b",
@@ -317,7 +316,7 @@ def addParseParam(parser):
         "--gn-extra-param",
         nargs="?",
         default="",
-        help="Pass extra param to src/flutter/tools/gn.",
+        help="Extra param to src/flutter/tools/gn. Such as: -g \"\\--enable-unittests\"",
     )
 
 
@@ -367,10 +366,10 @@ def buildByNameAndType(args):
 
 
 def main():
-    checkEnvironment()
     parser = argparse.ArgumentParser()
     addParseParam(parser)
     args = parser.parse_args()
+    checkEnvironment()
     updateCode(args)
     buildByNameAndType(args)
     logging.info("main() finish.")
-- 
Gitee