aa不再作为独立部件

Signed-off-by: 杨亮 <yangliang36@huawei.com>
Change-Id: I5c4932bd2227e0db3e4b7da791c7b06f2204ecd1

bundle.json

@@ -17,7 +17,8 @@
         "SystemCapability.Ability.AbilityRuntime.FAModel",
         "SystemCapability.Ability.AbilityRuntime.AbilityCore",
         "SystemCapability.Ability.AbilityRuntime.Mission",
-        "SystemCapability.Ability.AbilityRuntime.QuickFix"
+        "SystemCapability.Ability.AbilityRuntime.QuickFix",
+        "SystemCapability.Ability.AbilityTools.AbilityAssistant"
       ],
       "features": [
         "ability_runtime_graphics",
@@ -81,6 +82,7 @@
           "//foundation/ability/ability_runtime/services:ams_target",
           "//foundation/ability/ability_runtime/services/sa_profile:ams_sa_profile",
           "//foundation/ability/ability_runtime/services/quickfixmgr:quick_fix.cfg",
+          "//foundation/ability/ability_runtime/tools:tools_target",
           "//foundation/ability/ability_runtime/interfaces/inner_api:innerkits_target",
           "//foundation/ability/ability_runtime/frameworks/native/ability/native:ability_thread",
           "//foundation/ability/ability_runtime/frameworks/native/ability/native:extension_module",
@@ -295,6 +297,9 @@
           "//foundation/ability/ability_runtime/test/moduletest:moduletest",
           "//foundation/ability/ability_runtime/test/fuzztest:fuzztest",
           "//foundation/ability/ability_runtime/test/unittest:unittest",
+          "//foundation/ability/ability_runtime/tools/test:moduletest",
+          "//foundation/ability/ability_runtime/tools/test:systemtest",
+          "//foundation/ability/ability_runtime/tools/test:unittest",
           "//foundation/ability/ability_runtime/js_environment/test/unittest:unittest",
           "//foundation/ability/ability_runtime/service_router_framework:test_target"
         ]

tools/aa/BUILD.gn

@@ -68,7 +68,7 @@ ohos_source_set("tools_aa_source_set") {
   ]
 
   subsystem_name = "ability"
-  part_name = "ability_tools"
+  part_name = "ability_runtime"
 }
 
 ohos_executable("aa") {
@@ -113,13 +113,13 @@ ohos_executable("aa") {
   install_enable = true
 
   subsystem_name = "ability"
-  part_name = "ability_tools"
+  part_name = "ability_runtime"
 }
 
 ohos_prebuilt_etc("shell_command_executor_config.json") {
   source = "resource/shell_command_executor_config.json"
   subsystem_name = "ability"
-  part_name = "ability_tools"
+  part_name = "ability_runtime"
 }
 
 group("tools_aa") {

tools/bundle.json

@@ -1,46 +0,0 @@
-{
-    "name": "@ohos/ability_tools",
-    "description": "元能力命令行工具 : 提供命令行中启动Ability, 打印Aility栈信息的能力",
-    "version": "3.1",
-    "license": "Apache License 2.0",
-    "publishAs": "code-segment",
-    "segment": {
-        "destPath": "foundation/ability/ability_runtime/tools"
-    },
-    "dirs": {},
-    "scripts": {},
-    "component": {
-        "name": "ability_tools",
-        "subsystem": "ability",
-        "syscap": [
-            "SystemCapability.Ability.AbilityTools.AbilityAssistant"
-        ],
-        "features": [],
-        "adapted_system_type": [
-            "standard"
-        ],
-        "rom": "100KB",
-        "ram": "100KB",
-        "deps": {
-            "components": [
-                "ability_runtime",
-                "hiviewdfx_hilog_native",
-                "ipc",
-                "samgr",
-                "c_utils"
-            ],
-            "third_party": []
-        },
-        "build": {
-            "sub_component": [
-                "//foundation/ability/ability_runtime/tools:tools_target"
-            ],
-            "inner_kits": [],
-            "test": [
-                "//foundation/ability/ability_runtime/tools/test:moduletest",
-                "//foundation/ability/ability_runtime/tools/test:systemtest",
-                "//foundation/ability/ability_runtime/tools/test:unittest"
-            ]
-        }
-    }
-}