From 2acbc980882a90dd30ecbe5101e63443e04ef146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=98=8A=E8=8B=8F?= Date: Wed, 22 Oct 2025 10:27:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E7=8B=AC=E7=AB=8B=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘昊苏 --- BUILD.gn | 6 +++--- bundle.json | 8 ++++---- patches/patches.json | 9 --------- 3 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 patches/patches.json diff --git a/BUILD.gn b/BUILD.gn index 801b90b..2ccc733 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -13,11 +13,11 @@ import("//build/ohos.gni") -source_dir = "//third_party/third_party_sane-airscan" +source_dir = "//third_party/sane-airscan" target_dir = "${target_gen_dir}/patches" action("airscan_action") { - script = "//third_party/third_party_sane-airscan/patch_install.py" + script = "//third_party/sane-airscan/patch_install.py" inputs = [ "${source_dir}/patches/oh-transplant.patch" ] outputs = [ "${target_dir}/patches/airscan-conf.c", @@ -104,7 +104,7 @@ ohos_shared_library("sane-airscan") { ldflags = [ "-ldl" ] subsystem_name = "thirdparty" - part_name = "third_party_sane-airscan" + part_name = "sane-airscan" } #the target group diff --git a/bundle.json b/bundle.json index 72b6a59..d082ae6 100644 --- a/bundle.json +++ b/bundle.json @@ -1,17 +1,17 @@ { - "name": "@ohos/third_party_sane-airscan", + "name": "@ohos/sane-airscan", "description": "sane-airscan is an implementation of the AirScan/eSCL protocol in the SANE (Scanner Access Now Easy) framework. It allows access to scanner devices that support Apple AirScan or eSCL protocols through IP networks.", "version": "0.99.35", "license": "GPL v2", "publishAs":"code-segment", "segment":{ - "destPath":"third_party/third_party_sane-airscan" + "destPath":"third_party/sane-airscan" }, "dirs":{}, "scripts":{}, "licensePath": "COPYING", "component": { - "name": "third_party_sane-airscan", + "name": "sane-airscan", "subsystem": "thirdparty", "syscap": [], "features": [], @@ -32,7 +32,7 @@ }, "build": { "sub_component": [ - "//third_party/third_party_sane-airscan:third_airscan" + "//third_party/sane-airscan:third_airscan" ], "test": [] } diff --git a/patches/patches.json b/patches/patches.json deleted file mode 100644 index ba102de..0000000 --- a/patches/patches.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "patches": [ - { - "project": "productdefine_common", - "path": "productdefine/common", - "pr_url": "https://gitee.com/openharmony/productdefine_common/pulls/1044" - } - ] -} \ No newline at end of file