From 8cb085944ef0b90d571533e1c2a528799a236a5e Mon Sep 17 00:00:00 2001 From: swg3156201044 Date: Wed, 16 Oct 2024 02:47:37 +0000 Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E6=95=B4?= =?UTF-8?q?=E6=94=B9-=E5=8E=BB=E6=8E=89=E7=BC=96=E8=AF=91=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: swg3156201044 --- frameworks/account_iam/BUILD.gn | 4 ---- frameworks/domain_account/BUILD.gn | 5 +---- interfaces/kits/napi/BUILD.gn | 2 +- interfaces/kits/napi/account_iam/BUILD.gn | 1 + interfaces/kits/napi/appaccount/BUILD.gn | 1 + .../kits/napi/distributedaccount/BUILD.gn | 4 ---- services/accountmgr/BUILD.gn | 22 ++++--------------- tools/BUILD.gn | 5 +---- 8 files changed, 9 insertions(+), 35 deletions(-) diff --git a/frameworks/account_iam/BUILD.gn b/frameworks/account_iam/BUILD.gn index 840b81706..fd20b1221 100644 --- a/frameworks/account_iam/BUILD.gn +++ b/frameworks/account_iam/BUILD.gn @@ -81,10 +81,6 @@ ohos_shared_library("account_iam_innerkits") { "samgr:samgr_proxy", ] - if (ohos_indep_compiler_enable) { - external_deps += [ "ability_base:want" ] - } - cflags_cc = [] if (has_pin_auth_part) { cflags_cc += [ "-DHAS_PIN_AUTH_PART" ] diff --git a/frameworks/domain_account/BUILD.gn b/frameworks/domain_account/BUILD.gn index 835f14376..10cb62536 100644 --- a/frameworks/domain_account/BUILD.gn +++ b/frameworks/domain_account/BUILD.gn @@ -85,12 +85,9 @@ ohos_shared_library("domain_account_innerkits") { "c_utils:utils", "hilog:libhilog", "ipc:ipc_single", + "samgr:samgr_proxy", ] - if (ohos_indep_compiler_enable) { - external_deps += [ "samgr:samgr_proxy" ] - } - innerapi_tags = [ "platformsdk" ] subsystem_name = "account" part_name = "os_account" diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn index d94da9380..8718b3b5e 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -15,7 +15,7 @@ import("//build/ohos.gni") group("napi_packages") { deps = [] - if (support_jsapi && !ohos_indep_compiler_enable) { + if (support_jsapi) { deps += [ "appaccount:appaccount", "distributedaccount:distributedaccount", diff --git a/interfaces/kits/napi/account_iam/BUILD.gn b/interfaces/kits/napi/account_iam/BUILD.gn index 9c6b767b0..7a25877b0 100644 --- a/interfaces/kits/napi/account_iam/BUILD.gn +++ b/interfaces/kits/napi/account_iam/BUILD.gn @@ -55,6 +55,7 @@ ohos_shared_library("account_iam_napi") { external_deps = [ "c_utils:utils", "hilog:libhilog", + "ipc:ipc_core", "napi:ace_napi", ] diff --git a/interfaces/kits/napi/appaccount/BUILD.gn b/interfaces/kits/napi/appaccount/BUILD.gn index ff5031845..e6c575237 100644 --- a/interfaces/kits/napi/appaccount/BUILD.gn +++ b/interfaces/kits/napi/appaccount/BUILD.gn @@ -72,6 +72,7 @@ ohos_shared_library("appaccount") { "ability_runtime:runtime", "ability_runtime:service_extension", "ability_runtime:ui_extension", + "ability_runtime:wantagent_innerkits", "c_utils:utils", "hilog:libhilog", "ipc:ipc_napi", diff --git a/interfaces/kits/napi/distributedaccount/BUILD.gn b/interfaces/kits/napi/distributedaccount/BUILD.gn index d540c6807..9dec843d7 100644 --- a/interfaces/kits/napi/distributedaccount/BUILD.gn +++ b/interfaces/kits/napi/distributedaccount/BUILD.gn @@ -58,10 +58,6 @@ ohos_shared_library("distributedaccount") { "napi:ace_napi", ] - if (ohos_indep_compiler_enable) { - external_deps += [ "ipc:ipc_core" ] - } - part_name = "os_account" subsystem_name = "account" } diff --git a/services/accountmgr/BUILD.gn b/services/accountmgr/BUILD.gn index 4b884e765..d547c9ee3 100644 --- a/services/accountmgr/BUILD.gn +++ b/services/accountmgr/BUILD.gn @@ -55,13 +55,6 @@ config("accountmgr_config") { "${os_account_dfx_path}/hitrace_adapter", "${app_account_innerkits_native_path}/include", ] - if (ohos_indep_compiler_enable) { - include_dirs += [ - "${binarys_path}/foundation/bundlemanager/bundle_framework/innerapis/appexecfwk_core/includes/app_control", - "${binarys_path}/third_party/jsoncpp/innerapis/jsoncpp/includes", - "${binarys_path}/base/useriam/user_auth_framework/innerapis/userauth_client/includes", - ] - } } config("account_iam_config") { @@ -140,7 +133,7 @@ if (has_kv_store_part) { ] } -if (has_user_auth_part && !ohos_indep_compiler_enable) { +if (has_user_auth_part) { account_iam_sources = [ "src/account_iam/account_iam_callback.cpp", "src/account_iam/account_iam_client_callback_proxy.cpp", @@ -271,20 +264,13 @@ ohos_shared_library("accountmgr") { cflags_cc += [ "-DHAS_HUKS_PART" ] } - if (ohos_indep_compiler_enable) { - external_deps += [ - "ability_base:session_info", - "ability_runtime:ability_connect_callback_stub", - ] - } - if (has_theme_mar_part) { external_deps += [ "theme_mgr:theme_manager_client" ] cflags_cc += [ "-DHAS_THEME_SERVICE_PART" ] } configs += [ ":account_iam_config" ] - if (has_user_auth_part && !ohos_indep_compiler_enable) { + if (has_user_auth_part) { cflags_cc += [ "-DHAS_USER_AUTH_PART", "-DHAS_USER_IDM_PART", @@ -344,7 +330,7 @@ ohos_shared_library("accountmgr") { cflags_cc += [ "-DHICOLLIE_ENABLE" ] } - if (security_guard_enabled && !ohos_indep_compiler_enable) { + if (security_guard_enabled) { external_deps += [ "security_guard:libsg_collect_sdk", "time_service:time_client", @@ -362,7 +348,7 @@ ohos_shared_library("accountmgr") { cflags_cc += [ "-DHAS_ASSET_PART" ] } - if (has_config_policy_part && !ohos_indep_compiler_enable) { + if (has_config_policy_part) { external_deps += [ "config_policy:configpolicy_util" ] cflags_cc += [ "-DHAS_CONFIG_POLICY_PART" ] } diff --git a/tools/BUILD.gn b/tools/BUILD.gn index 214d104f9..feff80d94 100644 --- a/tools/BUILD.gn +++ b/tools/BUILD.gn @@ -14,8 +14,5 @@ import("//build/ohos.gni") group("tools_acm") { - deps = [] - if (!ohos_indep_compiler_enable) { - deps += [ "acm:acm" ] - } + deps = [ "acm:acm" ] }