部件整改

Signed-off-by: zt147369 <zhangting201@huawei.com>

BUILD.gn

@@ -13,6 +13,8 @@
 
 import("//build/ohos.gni")
 import("//build/test.gni")
+import("./restool.gni")
+
 ohos_executable("restool") {
   sources = [
     "src/append_compiler.cpp",
@@ -53,8 +55,7 @@ ohos_executable("restool") {
     "src/xml/xml_key_node.cpp",
   ]
 
-  include_dirs = []
-  include_dirs += [
+  include_dirs = [
     "include",
     "//third_party/jsoncpp/include",
     "//third_party/sqlite/include",
@@ -62,9 +63,9 @@ ohos_executable("restool") {
   ]
 
   deps = [
-    "//developtools/global_resource_tool/build/bounds_checking_function:restool_bounds_checking_function",
-    "//developtools/global_resource_tool/build/jsoncpp:restool_jsoncpp",
-    "//developtools/global_resource_tool/build/sqlite3:restool_sqlite",
+    "build/bounds_checking_function:restool_bounds_checking_function",
+    "build/jsoncpp:restool_jsoncpp",
+    "build/sqlite3:restool_sqlite",
     "//third_party/libxml2:static_libxml2",
   ]
 
@@ -84,21 +85,17 @@ ohos_unittest_py("restool_test") {
   sources = [ "test/test.py" ]
 }
 
-ID_DEFINED_PATH = "//base/global/system_resources/systemres/main/resources/base/element/id_defined.json"
-
 ohos_copy("restool_id_defined") {
-  sources = [ "${ID_DEFINED_PATH}" ]
-  outputs =
-      [ get_label_info(
-            "//developtools/global_resource_tool:restool($host_toolchain)",
-            "root_out_dir") + "/developtools/global_resource_tool/" ]
-  deps = [ "//developtools/global_resource_tool:restool($host_toolchain)" ]
+  sources = [ "${id_defined_path}" ]
+  outputs = [ get_label_info(":restool($host_toolchain)", "root_out_dir") +
+              "/developtools/global_resource_tool/" ]
+  deps = [ ":restool($host_toolchain)" ]
   subsystem_name = "developtools"
   part_name = "global_resource_tool"
 }
 
 ohos_prebuilt_etc("restool_systemres") {
-  source = "${ID_DEFINED_PATH}"
+  source = "${id_defined_path}"
   subsystem_name = "developtools"
   part_name = "global_resource_tool"
 }

bundle.json

@@ -1,7 +1,7 @@
 {
     "name": "@ohos/global_resource_tool",
     "description": "OpenHarmony resource compile.",
-    "version": "3.1",
+    "version": "4.0",
     "license": "Apache License 2.0",
     "pubiishAs": "code-segment",
     "segment": {
@@ -15,6 +15,8 @@
       "syscap": [],
       "feature": [],
       "adapted_system_type": ["mini", "small", "standard" ],
+      "rom": "0KB",
+      "ram": "0KB",
       "deps": {
         "components": [],
         "third_party": [

restool.gni

@@ -0,0 +1,14 @@
+# Copyright (c) 2023 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+id_defined_path = "//base/global/system_resources/systemres/main/resources/base/element/id_defined.json"