From 575229dd24903fe3da3451c6524da79f5ad83f02 Mon Sep 17 00:00:00 2001 From: huang-xl Date: Wed, 6 Apr 2022 15:58:53 +0800 Subject: [PATCH] inner_api Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: I13bd60b2b5c5bea473a901b3efe9155f18a1a295 --- frameworks/core/components/camera/BUILD.gn | 2 -- frameworks/core/components/video/BUILD.gn | 2 +- frameworks/core/components/video/media_player_callback.h | 2 +- frameworks/core/components/video/video_element.h | 2 +- frameworks/core/components/xcomponent/BUILD.gn | 1 - 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/frameworks/core/components/camera/BUILD.gn b/frameworks/core/components/camera/BUILD.gn index c46f3079..caf89a04 100644 --- a/frameworks/core/components/camera/BUILD.gn +++ b/frameworks/core/components/camera/BUILD.gn @@ -34,8 +34,6 @@ config("standard_camera_config") { "//foundation/multimedia/camera_standard/services/camera_service/binder/client/include", "//foundation/multimedia/camera_standard/services/camera_service/binder/server/include", "//foundation/multimedia/camera_standard/services/camera_service/include", - "//foundation/multimedia/media_standard/interfaces/innerkits/native/media/include", - "//foundation/multimedia/media_standard/interfaces/kits/native/include", "//utils/native/base/include", ] } diff --git a/frameworks/core/components/video/BUILD.gn b/frameworks/core/components/video/BUILD.gn index 93c0009c..14bb2e56 100644 --- a/frameworks/core/components/video/BUILD.gn +++ b/frameworks/core/components/video/BUILD.gn @@ -33,7 +33,7 @@ build_component("video") { if (is_standard_system && !use_mingw_win && !use_mac) { include_dirs = [ "//drivers/peripheral/display/interfaces/include", - "//foundation/multimedia/media_standard/interfaces/innerkits/native/include", + "//foundation/multimedia/media_standard/interfaces/inner_api/native", ] deps = [ "//foundation/graphic/standard:libwmclient" ] diff --git a/frameworks/core/components/video/media_player_callback.h b/frameworks/core/components/video/media_player_callback.h index 034ae263..d768835c 100644 --- a/frameworks/core/components/video/media_player_callback.h +++ b/frameworks/core/components/video/media_player_callback.h @@ -20,7 +20,7 @@ #include "core/common/container_scope.h" #include "core/components/video/video_utils.h" -#include "foundation/multimedia/media_standard/interfaces/innerkits/native/media/include/player.h" +#include "foundation/multimedia/media_standard/interfaces/inner_api/native/player.h" namespace OHOS::Ace { namespace { diff --git a/frameworks/core/components/video/video_element.h b/frameworks/core/components/video/video_element.h index 5412b246..e4ec233a 100644 --- a/frameworks/core/components/video/video_element.h +++ b/frameworks/core/components/video/video_element.h @@ -28,7 +28,7 @@ #ifdef OHOS_STANDARD_SYSTEM #include "core/components/video/media_player_callback.h" -#include "foundation/multimedia/media_standard/interfaces/innerkits/native/media/include/player.h" +#include "foundation/multimedia/media_standard/interfaces/inner_api/native/player.h" #include "window_manager.h" #endif diff --git a/frameworks/core/components/xcomponent/BUILD.gn b/frameworks/core/components/xcomponent/BUILD.gn index cb08c87b..d99835bd 100644 --- a/frameworks/core/components/xcomponent/BUILD.gn +++ b/frameworks/core/components/xcomponent/BUILD.gn @@ -31,7 +31,6 @@ build_component("xcomponent") { if (is_standard_system && !use_mingw_win && !use_mac) { include_dirs = [ "//drivers/peripheral/display/interfaces/include", - "//foundation/multimedia/media_standard/interfaces/innerkits/native/include", "//foundation/graphic/standard/interfaces/innerkits/wmclient", "//foundation/graphic/standard/interfaces/innerkits/wm", "//foundation/graphic/standard/interfaces/innerkits/surface",