diff --git a/rosen/modules/render_service_base/BUILD.gn b/rosen/modules/render_service_base/BUILD.gn index d4009fcd0c..126d56e998 100644 --- a/rosen/modules/render_service_base/BUILD.gn +++ b/rosen/modules/render_service_base/BUILD.gn @@ -406,6 +406,13 @@ ohos_source_set("render_service_base_src") { "$graphic_2d_root/utils/log", ] + if (is_arkui_x) { + include_dirs += [ + "$graphic_2d_root/utils/color_manager/export", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", + ] + } + include_dirs += [ "//third_party/skia/src" ] deps = [ diff --git a/rosen/modules/render_service_client/BUILD.gn b/rosen/modules/render_service_client/BUILD.gn index 18cb875518..3cbd754631 100644 --- a/rosen/modules/render_service_client/BUILD.gn +++ b/rosen/modules/render_service_client/BUILD.gn @@ -29,6 +29,13 @@ config("render_service_client_config") { "$graphic_2d_root/rosen/modules/2d_graphics", ] defines = rs_common_define + + if (defined(is_arkui_x) && is_arkui_x) { + include_dirs += [ + "$graphic_2d_root/utils/color_manager/export", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", + ] + } } template("render_service_client_source_set") { @@ -60,6 +67,13 @@ template("render_service_client_source_set") { "$graphic_2d_root/utils/sandbox", ] + if (defined(is_arkui_x) && is_arkui_x) { + include_dirs += [ + "$graphic_2d_root/utils/color_manager/export", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", + ] + } + sources = [ #animation "core/animation/rs_animation.cpp", diff --git a/rosen/modules/render_service_profiler/rs_profiler_pixelmap.cpp b/rosen/modules/render_service_profiler/rs_profiler_pixelmap.cpp index 89d88fb688..de530e9711 100644 --- a/rosen/modules/render_service_profiler/rs_profiler_pixelmap.cpp +++ b/rosen/modules/render_service_profiler/rs_profiler_pixelmap.cpp @@ -269,7 +269,7 @@ PixelMap* ImageSource::Unmarshalling(uint64_t id, Parcel& parcel) return nullptr; } -#if !defined(_WIN32) && !defined(_APPLE) && !defined(IOS_PLATFORM) && !defined(A_PLATFORM) +#if !defined(_WIN32) && !defined(_APPLE) && !defined(IOS_PLATFORM) && !defined(ANDROID_PLATFORM) if (context.allocType == AllocatorType::SHARE_MEM_ALLOC) { if (!UnmarshallFromSharedMem(context)) { return nullptr;