~aleteoryx/muditaos

68e0be1184a47cba467f4685ccf60cc0170d2c56 — Bartosz 3 years ago 215e4d9
[MOS-783] Fixed generating image for Harmony

Needed because of layout change
2 files changed, 7 insertions(+), 7 deletions(-)

M products/BellHybrid/CMakeLists.txt
M products/BellHybrid/paths/Paths.cpp
M products/BellHybrid/CMakeLists.txt => products/BellHybrid/CMakeLists.txt +6 -6
@@ 84,8 84,8 @@ include(AddVersionJson)

add_directories(
        TARGET create_user_directories
        PREFIX ${CMAKE_BINARY_DIR}/sysroot/sys/user/audio
        DEPENDS user_directories_common
        PREFIX ${CMAKE_BINARY_DIR}/sysroot/user/media/app
        DEPENDS system_directories_common
        DIRECTORIES relaxation
)



@@ 129,27 129,27 @@ include(DownloadAsset)
# copy all assets required to build catalog under current folder as in json recipe
download_asset_json(json-proprietary-target
                    ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_proprietary.json
                    ${CMAKE_BINARY_DIR}/sysroot/sys/current/
                    ${CMAKE_BINARY_DIR}/sysroot/system_a/
                    MuditaOSAssets
                    ${MUDITA_CACHE_DIR}
    )
download_asset_release_json(json-common-target
                            ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_common.json
                            ${CMAKE_BINARY_DIR}/sysroot/sys/current/
                            ${CMAKE_BINARY_DIR}/sysroot/system_a/
                            MuditaOSPublicAssets
                            0.0.15
                            ${MUDITA_CACHE_DIR}
    )
download_asset_release_json(json-community-target
                            ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_community.json
                            ${CMAKE_BINARY_DIR}/sysroot/sys/current/
                            ${CMAKE_BINARY_DIR}/sysroot/system_a/
                            MuditaOSPublicAssets
                            0.0.15
                            ${MUDITA_CACHE_DIR}
    )
download_asset_json(json-rt1051-target
                            ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_rt1051.json
                            ${CMAKE_BINARY_DIR}/sysroot/sys/current/
                            ${CMAKE_BINARY_DIR}/sysroot/system_a/
                            MuditaOSAssets
                            ${MUDITA_CACHE_DIR}
    )

M products/BellHybrid/paths/Paths.cpp => products/BellHybrid/paths/Paths.cpp +1 -1
@@ 10,7 10,7 @@ std::filesystem::path paths::audio::user() noexcept
}
std::filesystem::path paths::audio::proprietary() noexcept
{
    return purefs::dir::getCurrentOSPath() / "assets/audio";
    return purefs::dir::getAssetsDirPath() / "audio";
}
std::filesystem::path paths::audio::alarm() noexcept
{