From f03c3e4fbd24a35e3e8f692a612910f15925718b Mon Sep 17 00:00:00 2001 From: mengkun Date: Sun, 8 May 2022 12:21:42 +0800 Subject: [PATCH] change graphic/standard to graphic/graphic Signed-off-by: mengkun Change-Id: I274c7d75e1e074281e25890b8bcfac0a7cd743f3 --- camera_hdf/hdi_impl/BUILD.gn | 8 ++++---- camera_hdf/hdi_impl/test/BUILD.gn | 8 ++++---- camera_hdf/interfaces/hdi_ipc/client/BUILD.gn | 8 ++++---- camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn | 8 ++++---- camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn | 8 ++++---- distributedcamera.gni | 2 +- services/data_process/BUILD.gn | 6 +++--- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/camera_hdf/hdi_impl/BUILD.gn b/camera_hdf/hdi_impl/BUILD.gn index 88d7e2c1..bd015647 100644 --- a/camera_hdf/hdi_impl/BUILD.gn +++ b/camera_hdf/hdi_impl/BUILD.gn @@ -48,9 +48,9 @@ ohos_shared_library("distributed_camera_hdf") { "//third_party/jsoncpp/include", #producer - "//foundation/graphic/standard/frameworks/surface/include", - "//foundation/graphic/standard/interfaces/kits/surface", - "//foundation/graphic/standard/utils/buffer_handle/export", + "//foundation/graphic/graphic/frameworks/surface/include", + "//foundation/graphic/graphic/interfaces/kits/surface", + "//foundation/graphic/graphic/utils/buffer_handle/export", "//foundation/communication/ipc/ipc/native/src/core/include", "//drivers/peripheral/camera/interfaces/metadata/include", @@ -86,7 +86,7 @@ ohos_shared_library("distributed_camera_hdf") { "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/camera/interfaces/metadata:metadata", "//drivers/peripheral/display/hal:hdi_display_gralloc", - "//foundation/graphic/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/frameworks/surface:surface", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] diff --git a/camera_hdf/hdi_impl/test/BUILD.gn b/camera_hdf/hdi_impl/test/BUILD.gn index 6dc96ed0..47a958d1 100644 --- a/camera_hdf/hdi_impl/test/BUILD.gn +++ b/camera_hdf/hdi_impl/test/BUILD.gn @@ -48,9 +48,9 @@ ohos_executable("dcamera_hdi_sample") { "${hdf_uhdf_path}/osal/include", #producer - "//foundation/graphic/standard/frameworks/surface/include", - "//foundation/graphic/standard/interfaces/kits/surface", - "//foundation/graphic/standard/utils/include", + "//foundation/graphic/graphic/frameworks/surface/include", + "//foundation/graphic/graphic/interfaces/kits/surface", + "//foundation/graphic/graphic/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", "//drivers/peripheral/camera/interfaces/metadata/include", @@ -69,7 +69,7 @@ ohos_executable("dcamera_hdi_sample") { "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", "//drivers/peripheral/camera/interfaces/metadata:metadata", "//drivers/peripheral/display/hal:hdi_display_gralloc", - "//foundation/graphic/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/frameworks/surface:surface", ] external_deps = [ diff --git a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn index a03a0b48..12ae6f5e 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn @@ -34,9 +34,9 @@ ohos_shared_library("distributed_camera_hdf_client") { "//drivers/peripheral/base", #producer - "//foundation/graphic/standard/frameworks/surface/include", - "//foundation/graphic/standard/interfaces/kits/surface", - "//foundation/graphic/standard/utils/include", + "//foundation/graphic/graphic/frameworks/surface/include", + "//foundation/graphic/graphic/interfaces/kits/surface", + "//foundation/graphic/graphic/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", "//drivers/peripheral/camera/interfaces/metadata/include", ] @@ -71,7 +71,7 @@ ohos_shared_library("distributed_camera_hdf_client") { "${hdf_uhdf_path}/hdi:libhdi", "//drivers/peripheral/camera/interfaces/metadata:metadata", "//drivers/peripheral/display/hal:hdi_display_gralloc", - "//foundation/graphic/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/frameworks/surface:surface", "//utils/native/base:utils", ] diff --git a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn index 9ef5242f..3997ff40 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn @@ -40,9 +40,9 @@ ohos_shared_library("distributed_camera_host_config") { "${hdf_uhdf_path}/include/host", #producer - "//foundation/graphic/standard/frameworks/surface/include", - "//foundation/graphic/standard/interfaces/kits/surface", - "//foundation/graphic/standard/utils/include", + "//foundation/graphic/graphic/frameworks/surface/include", + "//foundation/graphic/graphic/interfaces/kits/surface", + "//foundation/graphic/graphic/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", "//drivers/peripheral/camera/interfaces/metadata/include", ] @@ -51,7 +51,7 @@ ohos_shared_library("distributed_camera_host_config") { deps = [ "${distributedcamera_hdf_path}/hdi_impl:distributed_camera_hdf", - "//foundation/graphic/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/frameworks/surface:surface", "//utils/native/base:utils", ] diff --git a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn index c0f645a9..8667d452 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn @@ -35,9 +35,9 @@ ohos_shared_library("distributed_camera_provider_config") { "${hdf_uhdf_path}/include/host", #producer - "//foundation/graphic/standard/frameworks/surface/include", - "//foundation/graphic/standard/interfaces/kits/surface", - "//foundation/graphic/standard/utils/include", + "//foundation/graphic/graphic/frameworks/surface/include", + "//foundation/graphic/graphic/interfaces/kits/surface", + "//foundation/graphic/graphic/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", "//drivers/peripheral/camera/interfaces/metadata/include", ] @@ -46,7 +46,7 @@ ohos_shared_library("distributed_camera_provider_config") { deps = [ "${distributedcamera_hdf_path}/hdi_impl:distributed_camera_hdf", - "//foundation/graphic/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/frameworks/surface:surface", "//utils/native/base:utils", ] diff --git a/distributedcamera.gni b/distributedcamera.gni index e3659aee..9f80f2e9 100644 --- a/distributedcamera.gni +++ b/distributedcamera.gni @@ -26,7 +26,7 @@ camerastandard_path = "//foundation/multimedia/camera_standard" mediastandard_path = "//foundation/multimedia/media_standard" -graphicstandard_path = "//foundation/graphic/standard" +graphicstandard_path = "//foundation/graphic/graphic" common_path = "${distributedcamera_path}/common" diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn index 75a37513..66605620 100644 --- a/services/data_process/BUILD.gn +++ b/services/data_process/BUILD.gn @@ -20,8 +20,8 @@ ohos_shared_library("distributed_camera_data_process") { include_dirs = [ "//utils/native/base/include", "//utils/system/safwk/native/include", - "//foundation/graphic/standard/interfaces/innerkits/common", - "//foundation/graphic/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/interfaces/innerkits/common", + "//foundation/graphic/graphic/interfaces/innerkits/surface", "//drivers/peripheral/display/interfaces/include", "//foundation/multimedia/media_standard/interfaces/innerkits/native/media/include", "${fwk_common_path}/log/include", @@ -72,7 +72,7 @@ ohos_shared_library("distributed_camera_data_process") { deps = [ "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", - "//foundation/graphic/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/frameworks/surface:surface", "//utils/native/base:utils", ] -- Gitee