diff --git a/conf/distro/include/openharmony.inc b/conf/distro/include/openharmony.inc new file mode 100644 index 0000000000000000000000000000000000000000..a519e5b14d1382d3567de6c6d19f90f5c7aed81d --- /dev/null +++ b/conf/distro/include/openharmony.inc @@ -0,0 +1,11 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +# OpenHarmony OS version +OPENHARMONY_VERSION ?= "3.1" +OPENHARMONY_OVERRIDES = "openharmony-${OPENHARMONY_VERSION}" +OPENHARMONY_VERSION_FULL = "${OPENHARMONY_VERSION}" +OPENHARMONY_VERSION_FULL:openharmony-3.1 = "3.1.1" + +PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}" diff --git a/conf/distro/oniro-openharmony-linux.conf b/conf/distro/oniro-openharmony-linux.conf index 7036ac9a2436b314b497b8b8984d5d3da1a110bb..d75f9c54f954e0e1bc1bdb195410f1a0bcfcd447 100644 --- a/conf/distro/oniro-openharmony-linux.conf +++ b/conf/distro/oniro-openharmony-linux.conf @@ -7,13 +7,8 @@ DISTRO_NAME = "Oniro/OpenHarmony Linux Distro" DISTRO_VERSION = "1.99.99" # OpenHarmony OS version -OPENHARMONY_VERSION ?= "3.1" - -DISTROOVERRIDES:append = ":openharmony-${OPENHARMONY_VERSION}" -OPENHARMONY_VERSION_FULL = "${OPENHARMONY_VERSION}" -OPENHARMONY_VERSION_FULL:openharmony-3.1 = "3.1.1" - -PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}" +require include/openharmony.inc +DISTROOVERRIDES:append = ":${OPENHARMONY_OVERRIDES}" # LLVM/Clang toolchain TOOLCHAIN = "clang"