!260 独立编译整改

Merge pull request !260 from fengshiyi/master

BUILD.gn

@@ -56,7 +56,6 @@ ohos_resources("Contacts_DataAbility_resources") {
 config("contactsdataability_public_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "//third_party/node/src",
     "ability/common/include",
     "ability/common/utils/include/",
     "dataBusiness/voicemail/include",
@@ -110,22 +109,14 @@ ohos_shared_library("contactsdataability") {
     "dataBusiness/voicemail/src/voicemail_database.cpp",
   ]
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//base/account/os_account/interfaces/innerkits/ohosaccount/native/include/",
-    "//base/account/os_account/interfaces/kits/napi/distributedaccount/include/",
-    "//base/account/os_account/interfaces/innerkits/include",
-    "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager/include",
-    "//foundation/ability/ability_runtime/interfaces/kits/native/ability/native",
   ]
 
-  deps = [ "//third_party/jsoncpp:jsoncpp" ]
-
   public_configs = [ ":contactsdataability_public_config" ]
   external_deps = [
     "ability_base:want",
     "ability_base:zuri",
     "ability_runtime:abilitykit_utils",
+    "ability_runtime:app_manager",
     "ability_runtime:app_context",
     "ability_runtime:dataobs_manager",
     "ability_runtime:extensionkit_native",
@@ -134,6 +125,7 @@ ohos_shared_library("contactsdataability") {
     "access_token:libtokenid_sdk",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "c_utils:utils",
     "c_utils:utilsbase",
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
@@ -143,6 +135,7 @@ ohos_shared_library("contactsdataability") {
     "ipc:ipc_single",
     "jsoncpp:jsoncpp",
     "napi:ace_napi",
+    "node:node_header_notice",
     "os_account:os_account_innerkits",
     "relational_store:native_dataability",
     "relational_store:native_rdb",

bundle.json

@@ -40,18 +40,17 @@
                 "eventhandler",
                 "hilog",
                 "ipc",
-                "jsoncpp",
                 "napi",
                 "os_account",
                 "preferences",
                 "relational_store",
                 "safwk",
                 "samgr",
-                "ace_engine"
+                "ace_engine",
+                "jsoncpp",
+                "node"
             ],
-            "third_party": [
-                "jsoncpp"
-            ]
+            "third_party": []
         },
         "build": {
             "group_type": {

contacts/BUILD.gn

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/config/components/ets_frontend/es2abc_config.gni")
 import("//build/lite/config/component/lite_component.gni")
 import("//build/ohos.gni")
 
@@ -25,22 +25,13 @@ config("contactsapi_public_config") {
 jspath = "src/contact.js"
 
 # compile .js to .abc.
-action("gen_contact_abc") {
-  visibility = [ ":*" ]
-  script = "../../../../arkcompiler/ets_frontend/es2panda/scripts/generate_js_bytecode.py"
+es2abc_gen_abc("gen_contact_abc") {
+  src_js = rebase_path(jspath)
+  dst_file = rebase_path(target_out_dir + "/contact.abc")
 
-  args = [
-    "--src-js",
-    rebase_path(jspath),
-    "--dst-file",
-    rebase_path(target_out_dir + "/contact.abc"),
-    "--frontend-tool-path",
-    rebase_path("${es2abc_build_path}"),
-    "--module",
-  ]
-  deps = [ "../../../../arkcompiler/ets_frontend/es2panda:es2panda_build" ]
-  inputs = [ jspath ]
-  outputs = [ target_out_dir + "/contact.abc" ]
+  extra_args = [ "--module" ]
+  in_puts = [ jspath ]
+  out_puts = [ target_out_dir + "/contact.abc" ]
 }
 
 base_output_path = get_label_info(":contact_js", "target_out_dir")
@@ -71,12 +62,6 @@ ohos_shared_library("contact") {
   ]
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
-    "//commonlibrary/c_utils/base/include",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager/include",
-    "//foundation/ability/ability_runtime/services/abilitymgr/include",
-    "//foundation/ability/ability_runtime/interfaces/kits/native/ability/native",
   ]
 
   public_configs = [ ":contactsapi_public_config" ]
@@ -96,6 +81,7 @@ ohos_shared_library("contact") {
     "ability_base:zuri",
     "ability_runtime:abilitykit_native",
     "ability_runtime:app_context",
+    "ability_runtime:app_manager",
     "ability_runtime:extensionkit_native",
     "ability_runtime:napi_base_context",
     "access_token:libaccesstoken_sdk",

test/BUILD.gn

@@ -40,25 +40,14 @@ ohos_unittest("contacts_test") {
   ]
   deps = [
     "applications/standard/contacts_data:contactsdataability",
-    "//foundation/ability/ability_runtime/frameworks/native/ability/native:abilitykit_native",
-    "//foundation/arkui/napi:ace_napi",
-    "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
-    "//third_party/googletest:gtest_main",
-    "//third_party/jsoncpp:jsoncpp",
   ]
   include_dirs = [
-    "//utils/system/safwk/native/include",
-    "//commonlibrary/c_utils/base/include",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//base/account/os_account/interfaces/innerkits/include",
-    "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager/include",
-    "//foundation/ability/ability_runtime/services/abilitymgr/include",
-    "//foundation/ability/ability_runtime/interfaces/kits/native/ability/native",
   ]
   public_configs = [ ":test_public_config" ]
   external_deps = [
     "ability_base:want",
     "ability_base:zuri",
+    "ability_runtime:abilitykit_native",
     "ability_runtime:ability_manager",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
@@ -69,12 +58,19 @@ ohos_unittest("contacts_test") {
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
+    "napi:ace_napi",
     "preferences:native_preferences",
+    "os_account:os_account_innerkits",
     "relational_store:native_appdatafwk",
     "relational_store:native_dataability",
     "relational_store:native_rdb",
     "relational_store:rdb_data_share_adapter",
+    "safwk:system_ability_fwk",
   ]
+  if(is_standard_system) {
+    external_deps += [ ""googletest:gtest_main" ]
+  }
 
   defines = [
     "CONTACTSDATA_LOG_TAG = \"ContactsTest\"",