部件整改

Signed-off-by: wangchaole <wangchaole1@huawei.com>
This commit is contained in:
wangchaole
2022-06-07 09:56:02 +08:00
parent 08f422e64b
commit 171bc41f96
34 changed files with 60 additions and 60 deletions
+1 -1
View File
@@ -25,7 +25,7 @@
## **目录**
```
/foundation/distributedhardware/distributedcamera
/foundation/distributedhardware/distributed_camera
├── camera_hdf # 分布式相机HAL功能
├── common # 分布式相机公共模块
├── interfaces # 分布式相机对外接口模块
+27 -27
View File
@@ -7,7 +7,7 @@
"license":"Apache License 2.0",
"publishAs":"code-segment",
"segment":{
"destPath":"foundation/distributedhardware/distributedcamera/"
"destPath":"foundation/distributedhardware/distributed_camera/"
},
"dirs":{},
"scripts":{},
@@ -24,7 +24,7 @@
"rom":"2000k",
"ram":"6M",
"hisysevent_config": [
"//foundation/distributedhardware/distributedcamera/hisysevent.yaml"
"//foundation/distributedhardware/distributed_camera/hisysevent.yaml"
],
"deps":{
"components":[
@@ -50,28 +50,28 @@
},
"build":{
"sub_component":[
"//foundation/distributedhardware/distributedcamera/common:distributed_camera_utils",
"//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_sink:distributed_camera_sink_sdk",
"//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_source:distributed_camera_source_sdk",
"//foundation/distributedhardware/distributedcamera/services/cameraservice/cameraoperator/client:distributed_camera_client",
"//foundation/distributedhardware/distributedcamera/services/cameraservice/cameraoperator/handler:distributed_camera_handler",
"//foundation/distributedhardware/distributedcamera/services/cameraservice/sinkservice:distributed_camera_sink",
"//foundation/distributedhardware/distributedcamera/services/cameraservice/sourceservice:distributed_camera_source",
"//foundation/distributedhardware/distributedcamera/services/data_process:distributed_camera_data_process",
"//foundation/distributedhardware/distributedcamera/sa_profile:dcamera_sa_profile",
"//foundation/distributedhardware/distributedcamera/sa_profile:dcamera.cfg",
"//foundation/distributedhardware/distributedcamera/services/channel:distributed_camera_channel",
"//foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/hdi_ipc/config/host:distributed_camera_host_config",
"//foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/hdi_ipc/config/provider:distributed_camera_provider_config",
"//foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/hdi_ipc/client:distributed_camera_hdf_client",
"//foundation/distributedhardware/distributedcamera/camera_hdf/hdi_impl:distributed_camera_hdf"
"//foundation/distributedhardware/distributed_camera/common:distributed_camera_utils",
"//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_sink:distributed_camera_sink_sdk",
"//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_source:distributed_camera_source_sdk",
"//foundation/distributedhardware/distributed_camera/services/cameraservice/cameraoperator/client:distributed_camera_client",
"//foundation/distributedhardware/distributed_camera/services/cameraservice/cameraoperator/handler:distributed_camera_handler",
"//foundation/distributedhardware/distributed_camera/services/cameraservice/sinkservice:distributed_camera_sink",
"//foundation/distributedhardware/distributed_camera/services/cameraservice/sourceservice:distributed_camera_source",
"//foundation/distributedhardware/distributed_camera/services/data_process:distributed_camera_data_process",
"//foundation/distributedhardware/distributed_camera/sa_profile:dcamera_sa_profile",
"//foundation/distributedhardware/distributed_camera/sa_profile:dcamera.cfg",
"//foundation/distributedhardware/distributed_camera/services/channel:distributed_camera_channel",
"//foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/hdi_ipc/config/host:distributed_camera_host_config",
"//foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/hdi_ipc/config/provider:distributed_camera_provider_config",
"//foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/hdi_ipc/client:distributed_camera_hdf_client",
"//foundation/distributedhardware/distributed_camera/camera_hdf/hdi_impl:distributed_camera_hdf"
],
"inner_kits":[
{
"type":"so",
"name":"//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_sink:distributed_camera_sink_sdk",
"name":"//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_sink:distributed_camera_sink_sdk",
"header":{
"header_base":"//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_sink/include",
"header_base":"//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_sink/include",
"header_files":[
"idistributed_camera_sink.h"
]
@@ -79,9 +79,9 @@
},
{
"type":"so",
"name":"//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_source:distributed_camera_source_sdk",
"name":"//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_source:distributed_camera_source_sdk",
"header":{
"header_base":"//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_source/include",
"header_base":"//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_source/include",
"header_files":[
"idistributed_camera_source.h"
]
@@ -89,12 +89,12 @@
}
],
"test":[
"//foundation/distributedhardware/distributedcamera/services/cameraservice/cameraoperator/client/test/unittest:camera_client_test",
"//foundation/distributedhardware/distributedcamera/services/cameraservice/cameraoperator/handler/test/unittest:camera_handler_test",
"//foundation/distributedhardware/distributedcamera/services/cameraservice/sinkservice/test/unittest:sink_service_test",
"//foundation/distributedhardware/distributedcamera/services/cameraservice/sourceservice/test/unittest:source_service_test",
"//foundation/distributedhardware/distributedcamera/services/cameraservice/base/test/unittest:services_base_test",
"//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/test/fuzztest:fuzztest"
"//foundation/distributedhardware/distributed_camera/services/cameraservice/cameraoperator/client/test/unittest:camera_client_test",
"//foundation/distributedhardware/distributed_camera/services/cameraservice/cameraoperator/handler/test/unittest:camera_handler_test",
"//foundation/distributedhardware/distributed_camera/services/cameraservice/sinkservice/test/unittest:sink_service_test",
"//foundation/distributedhardware/distributed_camera/services/cameraservice/sourceservice/test/unittest:source_service_test",
"//foundation/distributedhardware/distributed_camera/services/cameraservice/base/test/unittest:services_base_test",
"//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/test/fuzztest:fuzztest"
]
}
}
+1 -1
View File
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//drivers/adapter/uhdf2/uhdf.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_hdf") {
include_dirs = [
@@ -22,7 +22,7 @@
#include "constants.h"
#include "dcamera.h"
#include <foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h>
#include <foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/include/types.h>
#include <drivers/peripheral/camera/interfaces/include/types.h>
namespace OHOS {
@@ -22,7 +22,7 @@
#include "icamera_host_callback.h"
#include "icamera_device_callback.h"
#include <foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h>
#include <foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/include/types.h>
#include <drivers/peripheral/camera/interfaces/include/types.h>
namespace OHOS {
@@ -20,7 +20,7 @@
#include "dimage_buffer.h"
#include "dbuffer_manager.h"
#include <foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h>
#include <foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/include/types.h>
#include <drivers/peripheral/camera/interfaces/include/types.h>
namespace OHOS {
+1 -1
View File
@@ -16,7 +16,7 @@
#ifndef DISTRIBUTED_CAMERA_H
#define DISTRIBUTED_CAMERA_H
#include <foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h>
#include <foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/include/types.h>
#include <drivers/peripheral/camera/interfaces/include/types.h>
namespace OHOS {
+1 -1
View File
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//drivers/adapter/uhdf2/uhdf.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_executable("dcamera_hdi_sample") {
install_enable = false
+1 -1
View File
@@ -34,7 +34,7 @@
#include "display_type.h"
#include "distributed_hardware_log.h"
#include "drivers/peripheral/camera/interfaces/include/types.h"
#include "foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h"
#include "foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/include/types.h"
#include "icamera_device.h"
#include "icamera_host.h"
#include "idistributed_hardware_source.h"
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//drivers/adapter/uhdf2/uhdf.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_hdf_client") {
include_dirs = [
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//drivers/adapter/uhdf2/uhdf.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_host_config") {
include_dirs = [
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//drivers/adapter/uhdf2/uhdf.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_provider_config") {
include_dirs = [
@@ -24,7 +24,7 @@
#include <iservmgr_hdi.h>
#include "camera_metadata_info.h"
#include <foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h>
#include <foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/include/types.h>
#include <drivers/peripheral/camera/interfaces/include/types.h>
namespace OHOS {
+1 -1
View File
@@ -13,7 +13,7 @@
import("//build/ohos.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_utils") {
include_dirs = [
+1 -1
View File
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
distributedcamera_path = "//foundation/distributedhardware/distributedcamera"
distributedcamera_path = "//foundation/distributedhardware/distributed_camera"
distributedhardwarefwk_path =
"//foundation/distributedhardware/distributedhardwarefwk"
@@ -13,7 +13,7 @@
import("//build/ohos.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_sink_sdk") {
include_dirs = [
@@ -13,7 +13,7 @@
import("//build/ohos.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_source_sdk") {
include_dirs = [
@@ -15,7 +15,7 @@
import("//build/config/features.gni")
import("//build/test.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
##############################fuzztest##########################################
ohos_fuzztest("DCameraSinkHandlerIpcFuzzTest") {
@@ -15,7 +15,7 @@
import("//build/config/features.gni")
import("//build/test.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
##############################fuzztest##########################################
ohos_fuzztest("DCameraSinkLoadCallbackFuzzTest") {
@@ -15,7 +15,7 @@
import("//build/config/features.gni")
import("//build/test.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
##############################fuzztest##########################################
ohos_fuzztest("DCameraSinkProxyFuzzTest") {
@@ -15,7 +15,7 @@
import("//build/config/features.gni")
import("//build/test.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
##############################fuzztest##########################################
ohos_fuzztest("DCameraSourceHandlerIpcFuzzTest") {
@@ -15,7 +15,7 @@
import("//build/config/features.gni")
import("//build/test.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
##############################fuzztest##########################################
ohos_fuzztest("DCameraSourceLoadCallbackFuzzTest") {
@@ -13,7 +13,7 @@
import("//build/test.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
module_out_path = "distributed_camera/dcamera_protocol_test"
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//build/ohos_var.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_client") {
include_dirs = [
@@ -13,7 +13,7 @@
import("//build/test.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
module_out_path = "distributed_camera/dcamera_client_test"
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//build/ohos_var.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_handler") {
include_dirs = [
@@ -13,7 +13,7 @@
import("//build/test.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
module_out_path = "distributed_camera/dcamera_handler_test"
+1 -1
View File
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//build/ohos_var.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_sink") {
include_dirs = [
@@ -13,7 +13,7 @@
import("//build/test.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
module_out_path = "distributed_camera/dcamera_sink_test"
@@ -13,7 +13,7 @@
import("//build/test.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
module_out_path = "distributed_camera/dcamera_sink_mgr_test"
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//build/ohos_var.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_source") {
include_dirs = [
@@ -13,7 +13,7 @@
import("//build/test.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
module_out_path = "distributed_camera/dcamera_source_mgr_test"
+1 -1
View File
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//build/ohos_var.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_channel") {
include_dirs = [
+1 -1
View File
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//build/ohos_var.gni")
import(
"//foundation/distributedhardware/distributedcamera/distributedcamera.gni")
"//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
ohos_shared_library("distributed_camera_data_process") {
include_dirs = [