From 467150a463dbbe26879fad9b6d184a1fe49352a4 Mon Sep 17 00:00:00 2001 From: shilong Date: Thu, 15 May 2025 10:11:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E8=AF=81=E4=B8=80=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shilong --- drivers/external_device_manager/{base => ddk}/BUILD.gn | 4 ++-- drivers/external_device_manager/{base => ddk}/ddk_api.h | 0 drivers/external_device_manager/{base => ddk}/ddk_types.h | 0 .../external_device_manager/{base => ddk}/libbase.ndk.json | 0 drivers/external_device_manager/usb/BUILD.gn | 4 ++-- ndk_targets.gni | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) rename drivers/external_device_manager/{base => ddk}/BUILD.gn (95%) rename drivers/external_device_manager/{base => ddk}/ddk_api.h (100%) rename drivers/external_device_manager/{base => ddk}/ddk_types.h (100%) rename drivers/external_device_manager/{base => ddk}/libbase.ndk.json (100%) diff --git a/drivers/external_device_manager/base/BUILD.gn b/drivers/external_device_manager/ddk/BUILD.gn similarity index 95% rename from drivers/external_device_manager/base/BUILD.gn rename to drivers/external_device_manager/ddk/BUILD.gn index f02cd7542..8e455ad58 100644 --- a/drivers/external_device_manager/base/BUILD.gn +++ b/drivers/external_device_manager/ddk/BUILD.gn @@ -27,7 +27,7 @@ ohos_ndk_library("libddk_base") { output_name = "ddk_base" system_capability = "SystemCapability.Driver.DDK.Extension" system_capability_headers = [ - "base/ddk_api.h", - "base/ddk_types.h", + "ddk/ddk_api.h", + "ddk/ddk_types.h", ] } diff --git a/drivers/external_device_manager/base/ddk_api.h b/drivers/external_device_manager/ddk/ddk_api.h similarity index 100% rename from drivers/external_device_manager/base/ddk_api.h rename to drivers/external_device_manager/ddk/ddk_api.h diff --git a/drivers/external_device_manager/base/ddk_types.h b/drivers/external_device_manager/ddk/ddk_types.h similarity index 100% rename from drivers/external_device_manager/base/ddk_types.h rename to drivers/external_device_manager/ddk/ddk_types.h diff --git a/drivers/external_device_manager/base/libbase.ndk.json b/drivers/external_device_manager/ddk/libbase.ndk.json similarity index 100% rename from drivers/external_device_manager/base/libbase.ndk.json rename to drivers/external_device_manager/ddk/libbase.ndk.json diff --git a/drivers/external_device_manager/usb/BUILD.gn b/drivers/external_device_manager/usb/BUILD.gn index 1729e8970..020b0f6ff 100644 --- a/drivers/external_device_manager/usb/BUILD.gn +++ b/drivers/external_device_manager/usb/BUILD.gn @@ -16,7 +16,7 @@ import("//build/ohos.gni") ohos_ndk_headers("usb_header") { dest_dir = "$ndk_headers_out_dir/usb/" sources = [ - "../base/ddk_types.h", + "../ddk/ddk_types.h", "usb_ddk_api.h", "usb_ddk_types.h", ] @@ -30,6 +30,6 @@ ohos_ndk_library("libusb_ndk") { system_capability_headers = [ "usb/usb_ddk_api.h", "usb/usb_ddk_types.h", - "base/ddk_types.h", + "ddk/ddk_types.h", ] } diff --git a/ndk_targets.gni b/ndk_targets.gni index 116c203b4..bb0b0bf7e 100644 --- a/ndk_targets.gni +++ b/ndk_targets.gni @@ -200,8 +200,8 @@ _ndk_library_targets = [ "//interface/sdk_c/drivers/external_device_manager/scsi_peripheral:scsi_header", "//interface/sdk_c/drivers/external_device_manager/hid:libhid", "//interface/sdk_c/drivers/external_device_manager/hid:hid_header", - "//interface/sdk_c/drivers/external_device_manager/base:libddk_base", - "//interface/sdk_c/drivers/external_device_manager/base:ddk_header", + "//interface/sdk_c/drivers/external_device_manager/ddk:libddk_base", + "//interface/sdk_c/drivers/external_device_manager/ddk:ddk_header", "//interface/sdk_c/graphic/graphic_2d/vulkan:libvulkan_ndk", "//interface/sdk_c/graphic/graphic_2d/vulkan:vulkan_header", "//interface/sdk_c/graphic/graphic_2d/vulkan:vulkan_header_vk_video", -- Gitee