diff --git a/conf/distro/include/openharmony.inc b/conf/distro/include/openharmony.inc index 0bf6204dc86b026314757cd552d689e695f7fc68..8965c42402395d80b5ad98fd0df48c25fc5d3518 100644 --- a/conf/distro/include/openharmony.inc +++ b/conf/distro/include/openharmony.inc @@ -21,3 +21,10 @@ OPENHARMONY_OVERRIDES:df-openharmony = ":openharmony-${OPENHARMONY_VERSION}" DISTROOVERRIDES:append = "${OPENHARMONY_OVERRIDES}" PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}" + +# clang_rt.profile library is used in openharmony-standard build +PACKAGECONFIG:pn-compiler-rt = "profile" + +require openssl.inc +require java.inc +require musl-ldso-paths.inc diff --git a/conf/distro/oniro-openharmony-linux.conf b/conf/distro/oniro-openharmony-linux.conf index 69042a16249466d74f0de57f08a035a5a1b82793..85cbcf136e524d9b302355329a4439afb646bd66 100644 --- a/conf/distro/oniro-openharmony-linux.conf +++ b/conf/distro/oniro-openharmony-linux.conf @@ -14,8 +14,6 @@ DISTRO_FEATURES:append = " openharmony" TOOLCHAIN = "clang" RUNTIME = "llvm" -PACKAGECONFIG:pn-compiler-rt = "profile" - # musl libc TCLIBC = "musl" @@ -36,10 +34,6 @@ PREFERRED_VERSION_linux-yocto = "5.10.%" require conf/distro/include/yocto-uninative.inc INHERIT += "uninative" -require include/openssl.inc -require include/java.inc -require include/musl-ldso-paths.inc - # Workaround for missing host tools in do_testimage when not adding testimage to # IMAGE_CLASSES, but doing a direct `inherit testimage` in image recipes # instead.