From 08903e6eeae5b0c5b4d467e6dd2ef4a41b9ed6cb Mon Sep 17 00:00:00 2001
From: guoshengbang <guoshengbang@huawei.com>
Date: Thu, 5 Sep 2024 22:20:24 +0800
Subject: [PATCH 1/2] add build.gn of external_deps

Signed-off-by: guoshengbang <guoshengbang@huawei.com>
Change-Id: Ic654f21f45faeedec4843c29e0f262868432719f
---
 BUILD.gn    | 33 +++++++++++++++------------------
 bundle.json | 24 ++++++++++++++----------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index b5b262367..ee178e0c3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -36,7 +36,7 @@ backends_usb_header_file = [
 
 action("backends_action") {
   print("backends_action is exec")
-  script = "//third_party/backends/install.py"
+  script = "${source_dir}/install.py"
   outputs = []
   outputs += backends_usb_manager_source_file
   outputs += backends_usb_header_file
@@ -53,9 +53,9 @@ action("backends_action") {
 }
 
 base_deps = [
-  "//third_party/libxml2:xml2",
-  "//third_party/libpng:libpng",
-  "//third_party/libjpeg-turbo:turbojpeg",
+  "libxml2:libxml2",
+  "libpng:libpng",
+  "libjpeg-turbo:turbojpeg",
 ]
 
 config("base_config") {
@@ -108,7 +108,7 @@ ohos_source_set("lib") {
 
   configs = [":base_config"]
 
-  deps = base_deps
+  external_deps = base_deps
 
   subsystem_name = "thirdparty"
   part_name = "backends"
@@ -146,12 +146,10 @@ foreach (name, sanei_names) {
   ohos_source_set("$name") {
     sources = ["./sanei/$name.c"]
 
-    deps = base_deps
+    external_deps = base_deps
 
     if (enable_hilog) {
-        external_deps = [
-        "hilog:libhilog",
-        ]
+      external_deps += [ "hilog:libhilog" ]
     }
 
     configs = [":base_config"]
@@ -170,12 +168,11 @@ ohos_source_set("sanei_usb") {
     "$target_dir/src/usb_manager.cpp"
   ]
 
-  deps = base_deps
-  deps += [
-    ":backends_action"
-  ]
+  external_deps = base_deps
+
+  deps = [ ":backends_action" ]
 
-  external_deps = [
+  external_deps += [
     "c_utils:utils",
     "hilog:libhilog",
     "usb_manager:usbsrv_client",
@@ -197,7 +194,7 @@ ohos_static_library("sanei") {
 
   if (enable_hilog) {
     external_deps = [
-    "hilog:libhilog",
+      "hilog:libhilog",
     ]
   }
   
@@ -236,11 +233,11 @@ ohos_shared_library("sane") {
     ":lib",
   ]
 
-  deps += base_deps
+  external_deps = base_deps
 
   if (enable_hilog) {
-    external_deps = [
-    "hilog:libhilog",
+    external_deps += [
+      "hilog:libhilog",
     ]
   }
   
diff --git a/bundle.json b/bundle.json
index d76129bd4..ff58b8252 100644
--- a/bundle.json
+++ b/bundle.json
@@ -1,7 +1,7 @@
 {
-    "name": "@ohos/backends",
+    "name": "@ohos/sane",
     "description": "backends(Scanner Access Now Easy) is a framework for standardized access to any raster scanner",
-    "version": "1.1.1",
+    "version": "1.2.1",
     "license": "GPL v2",
     "publishAs": "code-segment",
     "segment": {
@@ -9,34 +9,38 @@
     },
     "dirs": {},
     "scripts": {},
+    "licensePath": "COPYING",
+    "readmePath": {
+        "en": "README"
+    },
     "component": {
         "name": "backends",
         "subsystem": "thirdparty",
         "syscap": [],
         "features": [],
-        "adapted_system_type": [],
-        "rom": "10KB",
-        "ram": "10KB",
+        "adapted_system_type": [ "standard" ],
+        "rom": "",
+        "ram": "",
         "deps": {
             "components": [
                 "hilog",
                 "usb_manager",
                 "bounds_checking_function",
-                "c_utils"
-            ],
-            "third_party": [
+                "c_utils",
                 "libxml2",
                 "libpng",
                 "libjpeg-turbo"
+            ],
+            "third_party": [
             ]
         },
         "build": {
             "sub_component": [
-                "//third_party/backends:third_sane"
+                "//third_party/backends:sane"
             ],
             "inner_kits": [
                 {
-                    "name": "//third_party/backends:third_sane",
+                    "name": "//third_party/backends:sane",
                     "header": {
                         "header_files": [
                             "sane/sane.h",
-- 
Gitee


From 508b2d978c6959cfab0835db530eb8df98d4a8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E7=9B=9B=E5=B8=AE?= <guoshengbang@huawei.com>
Date: Thu, 5 Sep 2024 16:40:31 +0000
Subject: [PATCH 2/2] update bundle.json.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 郭盛帮 <guoshengbang@huawei.com>
---
 bundle.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundle.json b/bundle.json
index ff58b8252..90474c65c 100644
--- a/bundle.json
+++ b/bundle.json
@@ -1,5 +1,5 @@
 {
-    "name": "@ohos/sane",
+    "name": "@ohos/backends",
     "description": "backends(Scanner Access Now Easy) is a framework for standardized access to any raster scanner",
     "version": "1.2.1",
     "license": "GPL v2",
@@ -19,8 +19,8 @@
         "syscap": [],
         "features": [],
         "adapted_system_type": [ "standard" ],
-        "rom": "",
-        "ram": "",
+        "rom": "10K",
+        "ram": "10K",
         "deps": {
             "components": [
                 "hilog",
-- 
Gitee