diff --git a/OAT.xml b/OAT.xml index d1c59fbe8b2e35818aaa218487c0109c32300fcf..a9da868a88ff6d8234044898d79e18612a554b0d 100644 --- a/OAT.xml +++ b/OAT.xml @@ -92,6 +92,7 @@ used to filter file path. + +export HOS_SDK_HOME= ``` 5. Start building: In the engine directory, execute `./ohos` to start building the flutter engine that supports ohos devices. diff --git a/README.md b/README.md index 46a7f3f1bc25de06ecb9f576a079098b1bd56817..5128877c778eefe42d3f45223cfc9e2c5dc43b0e 100644 --- a/README.md +++ b/README.md @@ -53,10 +53,10 @@ Flutter Engine 3. 同步代码:在engine目录,执行`gclient sync`;这里会同步engine源码、官方packages仓,还有执行ohos_setup任务; -4. 下载sdk: 在[每日构建](http://ci.openharmony.cn/workbench/cicd/dailybuild/dailylist)下载ohos-sdk-full,配置以下环境变量: +4. 下载sdk: 从[鸿蒙套件列表](https://developer.harmonyos.com/deveco-developer-suite/enabling/kit?currentPage=1&pageSize=100)下载配套开发工具,暂不支持非该渠道下载的套件 ```sh -export OHOS_SDK_HOME= +export HOS_SDK_HOME= ``` 5. 开始构建:在engine目录,执行`./ohos`,即可开始构建支持ohos设备的flutter engine。 diff --git a/attachment/repos/bootstrap/ohos.py b/attachment/repos/bootstrap/ohos.py index 4b0395bd357c2996a1e8ab99e20e409b6d3f5d8c..03a736c3def7c29d85b11be0b662d26e828ef963 100644 --- a/attachment/repos/bootstrap/ohos.py +++ b/attachment/repos/bootstrap/ohos.py @@ -137,12 +137,12 @@ def getNdkHome(): if not isNdkValid(OHOS_NDK_HOME): logging.error( """ - Please set the environment variables for HarmonyOS SDK to "HOS_SDK_HOME" or "OHOS_SDK_HOME". + Please set the environment variables for HarmonyOS SDK to "HOS_SDK_HOME" or "HOS_SDK_HOME". We will use both native/llvm and native/sysroot. Please ensure that the file "native/llvm/bin/clang" exists and is executable.""" ) exit(10) - return OHOS_NDK_HOME + return HOS_NDK_HOME # 校验 native def isNdkValid(path): @@ -162,20 +162,20 @@ def isNdkValid(path): # 指定engine编译的配置参数 def engineConfig(buildInfo, extraParam=""): - OHOS_NDK_HOME = getNdkHome() - # export PATH=$OHOS_NDK_HOME/build-tools/cmake/bin:$OHOS_NDK_HOME/llvm/bin:$PATH + HOS_NDK_HOME = getNdkHome() + # export PATH=$HOS_NDK_HOME/build-tools/cmake/bin:$HOS_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) + "%s%s" % (os.path.join(HOS_NDK_HOME, "build-tools", "cmake", "bin"), PATH_SEP) + + "%s%s" % (os.path.join(HOS_NDK_HOME, "build-tools", "llvm", "bin"), PATH_SEP) + "%s%s" % (os.path.abspath("depot_tools"), PATH_SEP) + lastPath ) unixCommand = "" if not IS_WINDOWS: unixCommand = ( - "--target-sysroot %s " % os.path.join(OHOS_NDK_HOME, "sysroot") - + "--target-toolchain %s " % os.path.join(OHOS_NDK_HOME, "llvm") + "--target-sysroot %s " % os.path.join(HOS_NDK_HOME, "sysroot") + + "--target-toolchain %s " % os.path.join(HOS_NDK_HOME, "llvm") + "--target-triple %s " % buildInfo.targetTriple ) OPT = "--unoptimized --no-lto " if buildInfo.buildType == "debug" else ""