diff --git a/frameworks/cj/ffi/want_agent/BUILD.gn b/frameworks/cj/ffi/want_agent/BUILD.gn index b6e9447be764c7805cd21f8fecf4fd32a2b3024d..41ab58d79f601f27a302780a047cbdc8a9dbcde2 100644 --- a/frameworks/cj/ffi/want_agent/BUILD.gn +++ b/frameworks/cj/ffi/want_agent/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2025 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 @@ -35,6 +35,7 @@ config("cj_want_agent_public_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] } ohos_shared_library("cj_want_agent_ffi") { diff --git a/frameworks/js/napi/js_dialog_session/BUILD.gn b/frameworks/js/napi/js_dialog_session/BUILD.gn index be9fc9139eb7528ba69db763b1ba85d841485e64..bcb60a6f2c93b9ff53ae3edd7287e5b6abb390ec 100644 --- a/frameworks/js/napi/js_dialog_session/BUILD.gn +++ b/frameworks/js/napi/js_dialog_session/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -21,7 +21,9 @@ ohos_shared_library("dialogsession_napi") { "native_module.cpp", ] - configs = [ "${ability_runtime_services_path}/common:common_config" ] + configs = [ + "${ability_runtime_services_path}/common:common_config", + ] include_dirs = [] diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index d74769b20b175e496d97098d1ad261ef911b9f3f..5b2f96f22a657512ca9a1a345d0e627f1815efbc 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -42,7 +42,7 @@ config("ability_config") { "${ability_runtime_napi_path}/inner/napi_common", "${ability_runtime_napi_path}/featureAbility", ] - + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -140,7 +140,7 @@ config("abilitykit_utils_public_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", ] - + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] if (ability_runtime_graphics) { defines = [ "SUPPORT_GRAPHICS" ] } @@ -550,7 +550,7 @@ config("extensionkit_public_config") { "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_services_path}/common/include", ] - + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] if (ability_runtime_graphics) { defines = [ "SUPPORT_GRAPHICS" ] } @@ -758,7 +758,7 @@ config("uiability_config") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] - + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] if (ability_runtime_graphics) { defines = [ "SUPPORT_GRAPHICS", @@ -1363,7 +1363,10 @@ ohos_shared_library("ui_service_extension_module") { sources = [ "${ability_runtime_native_path}/ability/native/ui_service_extension_ability/ui_service_extension_module_loader.cpp" ] - configs = [ ":ability_config" ] + configs = [ + ":ability_config", + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + ] deps = [ ":ui_service_extension" ] external_deps = [ @@ -2219,6 +2222,7 @@ config("embedded_ui_extension_module_config") { "${ability_runtime_napi_path}/featureAbility", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index 55d58d3ea7abfb7c584459f4181dd618d19c0223..a2bd3f9315ffabc09d32c684d22225186480a09e 100644 --- a/interfaces/inner_api/ability_manager/BUILD.gn +++ b/interfaces/inner_api/ability_manager/BUILD.gn @@ -42,6 +42,8 @@ config("ability_manager_public_config") { "${ability_runtime_innerkits_path}/dataobs_manager/include", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] + defines = [] if (ability_command_for_test) { diff --git a/interfaces/inner_api/app_manager/BUILD.gn b/interfaces/inner_api/app_manager/BUILD.gn index c9658b81753f9371a938e6f71a55f0b8f1ebf6d0..d738688ea50120ad78104c5f6dbe82c9ed836852 100644 --- a/interfaces/inner_api/app_manager/BUILD.gn +++ b/interfaces/inner_api/app_manager/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2023 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//build/config/components/idl_tool/idl.gni") import("//build/ohos.gni") import("//foundation/ability/ability_runtime/ability_runtime.gni") @@ -40,7 +41,113 @@ config("appmgr_core_config") { } } +idl_gen_interface("appmgr_innerkits") { + sources = [ + "idl/IConfigurationObserver.idl", + ] + log_domainid = "0xD001311" + log_tag = "AppMgr" + subsystem_name = "ability" + part_name = "ability_runtime" +} + +config("appmgr_innerkits_config") { + include_dirs = [ "${target_gen_dir}" ] +} + +ohos_source_set("appmgr_innerkits_include") { + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } + + public_configs = [ + ":appmgr_innerkits_config", + #"${ability_runtime_innerkits_path}/ability_manager:ability_manager_innerkits_config", + "${ability_runtime_path}/utils/server/startup:startup_util_config", + ] + + deps = [ + ":appmgr_innerkits", + #"${ability_runtime_innerkits_path}/ability_manager:ability_manager_innerkits", + "${ability_runtime_path}/utils/server/startup:startup_util", + ] + external_deps = [ + "bundle_framework:appexecfwk_base", + "c_utils:utils", + "hilog:libhilog", + "hitrace:hitrace_meter", + "ipc:ipc_core", + "samgr:samgr_proxy", + "ability_base:configuration", + ] + subsystem_name = "ability" + part_name = "ability_runtime" +} + +ohos_source_set("appmgr_innerkits_source") { + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } + configs = [ + ":appmgr_core_config", + ":appmgr_sdk_config", + ] + + public_configs = [ + ":appmgr_innerkits_config", + #"${ability_runtime_innerkits_path}/ability_manager:ability_manager_innerkits_config", + "${ability_runtime_path}/utils/server/startup:startup_util_config", + ] + + output_values = get_target_outputs(":appmgr_innerkits") + sources = filter_include(output_values, [ "*.cpp" ]) + + deps = [ + ":appmgr_innerkits", + #"${ability_runtime_innerkits_path}/ability_manager:ability_manager_innerkits", + "${ability_runtime_path}/utils/server/startup:startup_util", + ] + external_deps = [ + "c_utils:utils", + "faultloggerd:libfaultloggerd", + "ffrt:libffrt", + "hilog:libhilog", + "hisysevent:libhisysevent", + "hitrace:hitrace_meter", + "ipc:ipc_core", + "samgr:samgr_proxy", + "ability_base:configuration", + "ability_base:session_info", + "ability_base:want", + "bundle_framework:appexecfwk_base", + ] + + subsystem_name = "ability" + part_name = "ability_runtime" +} + ohos_shared_library("app_manager") { + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } branch_protector_ret = "pac_ret" include_dirs = [ @@ -94,8 +201,6 @@ ohos_shared_library("app_manager") { "src/appmgr/child_process_info.cpp", "src/appmgr/child_scheduler_proxy.cpp", "src/appmgr/child_scheduler_stub.cpp", - "src/appmgr/configuration_observer_proxy.cpp", - "src/appmgr/configuration_observer_stub.cpp", "src/appmgr/configuration_policy.cpp", "src/appmgr/fault_data.cpp", "src/appmgr/kia_interceptor_proxy.cpp", @@ -129,6 +234,8 @@ ohos_shared_library("app_manager") { public_configs = [ ":appmgr_core_config", ":appmgr_sdk_config", + ":appmgr_innerkits_config", + "${ability_runtime_path}/utils/server/startup:startup_util_config", ] defines = [ "AMS_LOG_TAG = \"AppexecfwkCore\"" ] @@ -138,6 +245,7 @@ ohos_shared_library("app_manager") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + ":appmgr_innerkits_source", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", diff --git a/interfaces/inner_api/app_manager/include/appmgr/iconfiguration_observer.h b/interfaces/inner_api/app_manager/idl/IConfigurationObserver.idl similarity index 39% rename from interfaces/inner_api/app_manager/include/appmgr/iconfiguration_observer.h rename to interfaces/inner_api/app_manager/idl/IConfigurationObserver.idl index eb36a604be44189dc2d4b34e45a496e42fc4320c..86efbbe6205c96efba47781eb77bf5b9d46d9c9e 100644 --- a/interfaces/inner_api/app_manager/include/appmgr/iconfiguration_observer.h +++ b/interfaces/inner_api/app_manager/idl/IConfigurationObserver.idl @@ -1,42 +1,19 @@ -/* - * Copyright (c) 2022 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. - */ - -#ifndef OHOS_ABILITY_RUNTIME_ICONFIGURATION_OBSERVER_H -#define OHOS_ABILITY_RUNTIME_ICONFIGURATION_OBSERVER_H - -#include "iremote_broker.h" -#include "iremote_object.h" -#include "configuration.h" - -namespace OHOS { -namespace AppExecFwk { -class IConfigurationObserver : public IRemoteBroker { -public: - DECLARE_INTERFACE_DESCRIPTOR(u"ohos.abilityruntime.IConfigurationObserver"); - - /** - * @brief Called when the system configuration is updated. - * - * @param configuration Indicates the updated configuration information. - */ - virtual void OnConfigurationUpdated(const AppExecFwk::Configuration& configuration) = 0; - - enum class Message { - TRANSACT_ON_CONFIGURATION_UPDATED = 0, - }; -}; -} // namespace AppExecFwk -} // namespace OHOS -#endif // OHOS_ABILITY_RUNTIME_ICONFIGURATION_OBSERVER_H +/* + * Copyright (c) 2025 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. + */ + sequenceable OHOS.AppExecFwk.Configuration; + + interface OHOS.AppExecFwk.IConfigurationObserver{ + [oneway]void OnConfigurationUpdated([in] Configuration configuration); + } \ No newline at end of file diff --git a/interfaces/inner_api/app_manager/include/appmgr/configuration_observer_proxy.h b/interfaces/inner_api/app_manager/include/appmgr/configuration_observer_proxy.h deleted file mode 100644 index e8e2afbe549c2ce40959a8d821af583f9eca481b..0000000000000000000000000000000000000000 --- a/interfaces/inner_api/app_manager/include/appmgr/configuration_observer_proxy.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2022 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. - */ - -#ifndef OHOS_ABILITY_RUNTIME_CONFIGURATION_OBSERVER_PROXY_H -#define OHOS_ABILITY_RUNTIME_CONFIGURATION_OBSERVER_PROXY_H - -#include "iremote_proxy.h" -#include "app_mgr_constants.h" -#include "iconfiguration_observer.h" -namespace OHOS { -namespace AppExecFwk { -class ConfigurationObserverProxy : public IRemoteProxy { -public: - explicit ConfigurationObserverProxy(const sptr &impl); - virtual ~ConfigurationObserverProxy() = default; - - /** - * @brief Called when the system configuration is updated. - * - * @param configuration Indicates the updated configuration information. - */ - virtual void OnConfigurationUpdated(const Configuration& configuration) override; - -private: - bool WriteInterfaceToken(MessageParcel &data); - static inline BrokerDelegator delegator_; -}; -} // namespace AppExecFwk -} // namespace OHOS -#endif // OHOS_ABILITY_RUNTIME_CONFIGURATION_OBSERVER_PROXY_H diff --git a/interfaces/inner_api/app_manager/include/appmgr/configuration_observer_stub.h b/interfaces/inner_api/app_manager/include/appmgr/configuration_observer_stub.h deleted file mode 100644 index 9b08304abce19b444dfd79f6a67a3088d145b831..0000000000000000000000000000000000000000 --- a/interfaces/inner_api/app_manager/include/appmgr/configuration_observer_stub.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2022 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. - */ - -#ifndef OHOS_ABILITY_RUNTIME_CONFIGURATION_OBSERVER_STUB_H -#define OHOS_ABILITY_RUNTIME_CONFIGURATION_OBSERVER_STUB_H - -#include - -#include "iremote_stub.h" -#include "app_mgr_constants.h" -#include "iconfiguration_observer.h" -#include "nocopyable.h" -#include "string_ex.h" - -namespace OHOS { -namespace AppExecFwk { -class ConfigurationObserverStub : public IRemoteStub { -public: - ConfigurationObserverStub(); - virtual ~ConfigurationObserverStub(); - - virtual int OnRemoteRequest( - uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; - - /** - * @brief Called when the system configuration is updated. - * - * @param configuration Indicates the updated configuration information. - */ - virtual void OnConfigurationUpdated(const Configuration& configuration) override; - -private: - int32_t HandleOnConfigurationUpdated(MessageParcel &data, MessageParcel &reply); - - DISALLOW_COPY_AND_MOVE(ConfigurationObserverStub); -}; -} // namespace AppExecFwk -} // namespace OHOS -#endif // OHOS_ABILITY_RUNTIME_CONFIGURATION_OBSERVER_STUB_H diff --git a/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp deleted file mode 100644 index 05567b0a48470651d69060383cc1f51b17036d88..0000000000000000000000000000000000000000 --- a/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2022-2024 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. - */ - -#include "configuration_observer_proxy.h" - -#include "hilog_tag_wrapper.h" -#include "ipc_types.h" - -namespace OHOS { -namespace AppExecFwk { -ConfigurationObserverProxy::ConfigurationObserverProxy( - const sptr &impl) : IRemoteProxy(impl) -{} - -bool ConfigurationObserverProxy::WriteInterfaceToken(MessageParcel &data) -{ - if (!data.WriteInterfaceToken(ConfigurationObserverProxy::GetDescriptor())) { - TAG_LOGE(AAFwkTag::APPMGR, "write interface token failed"); - return false; - } - return true; -} - -void ConfigurationObserverProxy::OnConfigurationUpdated(const Configuration& configuration) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option(MessageOption::TF_ASYNC); - if (!WriteInterfaceToken(data)) { - return; - } - data.WriteParcelable(&configuration); - sptr remote = Remote(); - if (remote == nullptr) { - TAG_LOGE(AAFwkTag::APPMGR, "Remote() is NULL"); - return; - } - int32_t ret = remote->SendRequest( - static_cast(IConfigurationObserver::Message::TRANSACT_ON_CONFIGURATION_UPDATED), - data, reply, option); - if (ret != NO_ERROR) { - TAG_LOGW(AAFwkTag::APPMGR, "SendRequest is failed, error code: %{public}d", ret); - } -} -} -} diff --git a/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_stub.cpp b/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_stub.cpp deleted file mode 100644 index 2bffb3fcff0b9f9c44aca1bf2d271db952f6f482..0000000000000000000000000000000000000000 --- a/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_stub.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2022-2024 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. - */ - -#include "configuration_observer_stub.h" - -#include "appexecfwk_errors.h" -#include "hilog_tag_wrapper.h" -#include "hitrace_meter.h" -#include "ipc_types.h" -#include "iremote_object.h" - -namespace OHOS { -namespace AppExecFwk { -ConfigurationObserverStub::ConfigurationObserverStub() {} - -ConfigurationObserverStub::~ConfigurationObserverStub() {} - -int ConfigurationObserverStub::OnRemoteRequest( - uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) -{ - TAG_LOGI(AAFwkTag::APPMGR, "ConfigurationObserverStub::OnRemoteRequest, code = %{public}u, flags= %{public}d.", - code, option.GetFlags()); - std::u16string descriptor = ConfigurationObserverStub::GetDescriptor(); - std::u16string remoteDescriptor = data.ReadInterfaceToken(); - if (descriptor != remoteDescriptor) { - TAG_LOGE(AAFwkTag::APPMGR, "local descriptor is not equivalent to remote"); - return ERR_INVALID_STATE; - } - - if (code == static_cast(IConfigurationObserver::Message::TRANSACT_ON_CONFIGURATION_UPDATED)) { - return HandleOnConfigurationUpdated(data, reply); - } - - TAG_LOGI(AAFwkTag::APPMGR, "ConfigurationObserverStub::OnRemoteRequest end"); - return IPCObjectStub::OnRemoteRequest(code, data, reply, option); -} - -void ConfigurationObserverStub::OnConfigurationUpdated(const Configuration& configuration) -{} - -int32_t ConfigurationObserverStub::HandleOnConfigurationUpdated(MessageParcel &data, MessageParcel &reply) -{ - HITRACE_METER(HITRACE_TAG_APP); - std::unique_ptr configuration(data.ReadParcelable()); - if (!configuration) { - TAG_LOGE(AAFwkTag::APPMGR, "ReadParcelable failed"); - return ERR_APPEXECFWK_PARCEL_ERROR; - } - - OnConfigurationUpdated(*configuration); - return NO_ERROR; -} -} -} diff --git a/interfaces/inner_api/wantagent/BUILD.gn b/interfaces/inner_api/wantagent/BUILD.gn index b1e9d373d3d8c656be1e22591d06408609ceea4b..e98e9094dad932963a063a838e1cee3b20972657 100644 --- a/interfaces/inner_api/wantagent/BUILD.gn +++ b/interfaces/inner_api/wantagent/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -43,6 +43,7 @@ config("wantagent_innerkits_public_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] } ohos_shared_library("wantagent_innerkits") { diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index b0fd3beeac876bf5434115ebc2555215b245e4e8..3bf13573a059507fa0f07e3d23ea82a6c4c10d25 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 diff --git a/services/uripermmgr/BUILD.gn b/services/uripermmgr/BUILD.gn index 50b810f4fa1c2d21a141f3d918da2f4d704b6543..9f3ada2c03fe6349e625509cd5f079de710dfc51 100644 --- a/services/uripermmgr/BUILD.gn +++ b/services/uripermmgr/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 diff --git a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn index 5a5195dbe1864b595a934b28814b0dcf54bea65f..98120953264a04a1c5f1f9653471728d0506cf46 100644 --- a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -40,7 +40,10 @@ ohos_fuzztest("AbilityAppMgrAppRunningManagerFuzzTest") { ] sources = [ "abilityappmgrapprunningmanager_fuzzer.cpp" ] - configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/appmgr:appmgr_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn index 7408f3ed9ebe2b3884f2c56b9f26ab41f5125e07..1023d627baff6e7c54a9101f96949a4622fc5c94 100644 --- a/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -43,7 +43,10 @@ ohos_fuzztest("AbilityAppMgrRenderStateObserverManagerFuzzTest") { "abilityappmgrrenderstateobservermanager_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitydebugdeal_fuzzer/BUILD.gn b/test/fuzztest/abilitydebugdeal_fuzzer/BUILD.gn index f9c6a7be98b0b10f651f3016cf7977479bf9ecb7..2f9e9994eee11f2a1728c72b745223b7bcd84b38 100644 --- a/test/fuzztest/abilitydebugdeal_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitydebugdeal_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -42,7 +42,10 @@ ohos_fuzztest("AbilityDebugDealFuzzTest") { "abilitydebugdeal_fuzzer.cpp", ] - configs = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager_public_config" ] + configs = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager_public_config", + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn b/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn index 3e80c6a632c3dbde1ff973ecd598dfb616702e6d..72bde8f348e65443182f2b32415a569d3e8f43d4 100644 --- a/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -57,6 +57,7 @@ ohos_fuzztest("AbilityFrameworksCjEnvironmentFuzzTest") { configs = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager_public_config", + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] diff --git a/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn b/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn index 0f694908169727b8513da1f4aaa772d983591b1f..69da3f9a2b4011a4bcce3c64d6eb62f2f846f8a9 100644 --- a/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -43,6 +43,7 @@ ohos_fuzztest("AbilityFrameworksNativeJsWorkerFuzzTest") { configs = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager_public_config", + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] diff --git a/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn b/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn index ae94e4da6bc4bde034dff075c315a5f028ae1ca5..d572c86abc6853cdff15faa4976870558471e47b 100644 --- a/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -50,6 +50,7 @@ ohos_fuzztest("AbilityFrameworksNativeOhosJsEnvLoggerFuzzTest") { configs = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager_public_config", + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] diff --git a/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn index 59f9f69213c341f8d989be2fe028079fe271dfeb..4065aee527ec9009a9a410549b1dfb5dd0671a65 100644 --- a/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -40,7 +40,10 @@ ohos_fuzztest("AbilityMgrAbilityManagerStubFuzzTest") { ] sources = [ "abilitymgrabilitymanagerstub_fuzzer.cpp" ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn index 2d8b71bfe1f45009d2962af39f9a600eb1df9b65..16d2e788e86f22fa260931f0c7c4b692f53cc15c 100644 --- a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -55,7 +55,10 @@ ohos_fuzztest("AbilityMgrAppExitReasonHelperFuzzTest") { "abilitymgrappexitreasonhelper_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn index cbb93be38ab2ba2a95acae5954b5d10f5799101f..6dcef8400bc5f2b4f04e06e0ff4e3fc441ac267a 100644 --- a/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -43,7 +43,10 @@ ohos_fuzztest("AbilityMgrControlInterceptorFuzzTest") { "abilitymgrcontrolinterceptor_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn index 94cec4cd04d3f403c5a9f8e7ff0a697af294fe40..0233f5f0b61ed84200f615fd2efcd8f25a75d79e 100644 --- a/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -37,7 +37,10 @@ ohos_fuzztest("AbilitymgrDisposedRuleInterceptorFuzzTest") { ] sources = [ "abilitymgrdisposedruleinterceptor_fuzzer.cpp" ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn index 6168d13febef2295fdbb91da3fe8b02958874085..bd85dc1f450cc22510905d9ebf3078181554aa89 100644 --- a/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -38,7 +38,10 @@ ohos_fuzztest("AbilitymgrEcologicalRuleInterceptorFuzzTest") { ] sources = [ "abilitymgrecologicalruleinterceptor_fuzzer.cpp" ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn index 8e5a3aef71381f2fc9392f31f30bf52bcb85d3d6..dd1684f6f35fc8a13aac92a101c6c8b15aa252bc 100644 --- a/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -43,6 +43,7 @@ ohos_fuzztest("AbilityMgrEcologicalRuleMgrServiceParamFuzzTest") { configs = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager_public_config", + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] diff --git a/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn index a95f63f32e86ef22b5369548d0304b86d3139d23..204600ebcbd6788758bc6509c7e92ce29a245b4b 100644 --- a/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -43,7 +43,10 @@ ohos_fuzztest("AbilityMgrExtensionRecordFuzzTest") { "abilitymgrextensionrecord_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn index d084d631ad6e007a26d9426af236f7b90cc122fd..6630f9afc7979ffee3ed587c3c30a0408a959dfc 100644 --- a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -48,7 +48,10 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") { "abilitymgrinsightintentexecutemanager_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn index 89fb92318811cb89ace895f56ee3b4c3ae1b714b..4ef73ecc221880d61e711b31d370b46aefeaa99c 100644 --- a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -43,7 +43,10 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteResultFuzzTest") { "abilitymgrinsightintentexecuteresult_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn index 4768c8f6e4180710214f80b5cf3f6fb651d85c07..afcecf35d7108434d089fc82eed62f58c96ac8f5 100644 --- a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -43,7 +43,10 @@ ohos_fuzztest("AbilityMgrInsightIntentUtilsFuzzTest") { "abilitymgrinsightintentutils_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn index f760e2f4fc3abd4a731acae0fb943f4259f79fa6..ecdbbc691fede0ef573416af9871869fc99528c2 100644 --- a/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -43,7 +43,10 @@ ohos_fuzztest("AbilityMgrInterceptorExecuterFuzzTest") { "abilitymgrinterceptorexecuter_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn index 898a52b0fc38d8daea04fa0ccfc680e81f72b28b..4bf19b682b598156e346ea6ae22efdbf0eb0d33e 100644 --- a/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -44,7 +44,10 @@ ohos_fuzztest("AbilityMgrJumpInterceptorFuzzTest") { "abilitymgrjumpinterceptor_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn index be18a998b05a85f86d3436fa737506b25fd9e52e..589f9014d6e2845ab6ee0005651c6d0a9828a4db 100644 --- a/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -43,7 +43,10 @@ ohos_fuzztest("AbilityMgrRdbParserUtilFuzzTest") { "abilitymgrrdbparserutil_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn index fb2edb8dbfb7c5d64f1a07a24144915ae40500fe..897cfcbe5687a341f15b38dfa2b71d0a7f898eeb 100644 --- a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -44,7 +44,10 @@ ohos_fuzztest("AbilityMgrUiExtensionRecordFuzzTest") { "abilitymgruiextensionrecord_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/abilitystartwithwaitdata_fuzzer/BUILD.gn b/test/fuzztest/abilitystartwithwaitdata_fuzzer/BUILD.gn index dfd4e7d069191e2a1ee0e62a3abf139766660f5b..be30c84b55c793eeaa3db7accbbb4cd0e4b483d0 100644 --- a/test/fuzztest/abilitystartwithwaitdata_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitystartwithwaitdata_fuzzer/BUILD.gn @@ -37,6 +37,8 @@ ohos_fuzztest("AbilityStartWithWaitDataFuzzTest") { "abilitystartwithwaitdata_fuzzer.cpp", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] + deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/appmgr:libappms", diff --git a/test/fuzztest/abilitystartwithwaitobservermanager_fuzzer/BUILD.gn b/test/fuzztest/abilitystartwithwaitobservermanager_fuzzer/BUILD.gn index 13eda3768e127d509bf2db685090ebdac63fd3d8..d974a1934ebb8461460a70ac82b757d37be6057c 100644 --- a/test/fuzztest/abilitystartwithwaitobservermanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitystartwithwaitobservermanager_fuzzer/BUILD.gn @@ -39,6 +39,8 @@ ohos_fuzztest("AbilityStartWithWaitObserverManagerFuzzTest") { "abilitystartwithwaitobservermanager_fuzzer.cpp", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] + deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", diff --git a/test/fuzztest/abilitystartwithwaitobserverproxy_fuzzer/BUILD.gn b/test/fuzztest/abilitystartwithwaitobserverproxy_fuzzer/BUILD.gn index 4a4e0e0c4c162918db1765fc63a0b7e2ec5400cd..f056dc25db320ea1f101cd84a6d3665c2b2263cb 100644 --- a/test/fuzztest/abilitystartwithwaitobserverproxy_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitystartwithwaitobserverproxy_fuzzer/BUILD.gn @@ -25,6 +25,8 @@ ohos_fuzztest("AbilityStartWithWaitObserverProxyFuzzTest") { "${ability_runtime_innerkits_path}/app_manager/include/appmgr", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] + cflags = [ "-g", "-O0", diff --git a/test/fuzztest/abilitystartwithwaitobserverstub_fuzzer/BUILD.gn b/test/fuzztest/abilitystartwithwaitobserverstub_fuzzer/BUILD.gn index 0f59d5043bd6ab1b9b44b6687a7bcf1fad1456ba..5c5b0c5a0c018d296a327aeba8c2b72a6a5a6f33 100644 --- a/test/fuzztest/abilitystartwithwaitobserverstub_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitystartwithwaitobserverstub_fuzzer/BUILD.gn @@ -25,6 +25,8 @@ ohos_fuzztest("AbilityStartWithWaitObserverStubFuzzTest") { "${ability_runtime_innerkits_path}/app_manager/include/appmgr", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] + cflags = [ "-g", "-O0", diff --git a/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn b/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn index 68bc5529b04711205410ebce690d79441da8ffed..ababa46bbf364686f39a1f072336f169ed487016 100644 --- a/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -38,7 +38,10 @@ ohos_fuzztest("CrowdTestInterceptorFuzzTest") { ] sources = [ "crowdtestinterceptor_fuzzer.cpp" ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn b/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn index ba66b5a29c5fe045f021f83cc61423f965f6ac3c..cd48bd0a1a396abe285f384162b9e52a9258ccf9 100644 --- a/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -43,7 +43,10 @@ ohos_fuzztest("ExtensionControlInterceptorFuzzTest") { "extension_control_interceptor_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/fuzztest/freezeutil_fuzzer/BUILD.gn b/test/fuzztest/freezeutil_fuzzer/BUILD.gn index 5e40f7db00e90d715404781060fea6f3f07b7092..4dda44424892b10a579ce99db52ee70fa8d3ae9e 100644 --- a/test/fuzztest/freezeutil_fuzzer/BUILD.gn +++ b/test/fuzztest/freezeutil_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -46,7 +46,10 @@ ohos_fuzztest("FreezeUtilFuzzTest") { "freezeutil_fuzzer.cpp", ] - configs = [ "${ability_runtime_utils_path}/global/freeze:freeze_util_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_utils_path}/global/freeze:freeze_util_config", + ] deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", diff --git a/test/fuzztest/jsabilityautostartupmanager_fuzzer/BUILD.gn b/test/fuzztest/jsabilityautostartupmanager_fuzzer/BUILD.gn index f406a549fb69d2c6664f734a87b44f2cbe1fa4a4..a4c92adfcb24f5d3e109446d8f8f7df11158e5a2 100755 --- a/test/fuzztest/jsabilityautostartupmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/jsabilityautostartupmanager_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 diff --git a/test/fuzztest/napicommonwant_fuzzer/BUILD.gn b/test/fuzztest/napicommonwant_fuzzer/BUILD.gn index 207c03a05ca0f0097bf902d8d8f50e1f7b728299..f93a8e7a21cff3530bcdfeaa3b7624cb98365662 100755 --- a/test/fuzztest/napicommonwant_fuzzer/BUILD.gn +++ b/test/fuzztest/napicommonwant_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 diff --git a/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn b/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn index 588260ac383ef0cca67e08f7e56d3855d640d106..d627a417bb12973f27b163eb07099f92003b9e5e 100644 --- a/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn +++ b/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -47,7 +47,10 @@ ohos_fuzztest("OpenLinkOptionsFuzzTest") { "openlinkoptions_fuzzer.cpp", ] - configs = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager_public_config" ] + configs = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager_public_config", + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + ] deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", diff --git a/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn b/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn index 0b590a85abde66edf7cd2a07e9d18051c49ad71e..5f1b43efe5798b813f104944c34500b899b304e1 100644 --- a/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -50,7 +50,10 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") { "screenunlockinterceptor_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn b/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn index 88a58b7ccc6f21e8d270b7ce1ed4a0d7efb513e4..332c105b68d948749e33f46f04e5704f80035448 100644 --- a/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -49,7 +49,10 @@ ohos_fuzztest("StartOtherappinterceptorFuzzTest") { "startotherappinterceptor_fuzzer.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn b/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn index 4f5f81f5e984bfe8467817321ddbedddf7987fc0..c4d8eeba97ef646dab13fb7c517a4647839c82ab 100644 --- a/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -50,7 +50,10 @@ ohos_fuzztest("StatusBarDelegateManagerFuzzTest") { "statusbardelegatemanager_fuzzer.cpp", ] - configs = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager_public_config" ] + configs = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager_public_config", + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + ] deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", diff --git a/test/mock/services_abilitymgr_test/libs/appexecfwk_core/BUILD.gn b/test/mock/services_abilitymgr_test/libs/appexecfwk_core/BUILD.gn index 94c7e0f3a5fee85be55bfc321dc47534b31d2fe6..44e9eeb97e47b6b8040cae75acaf19ecaefdadfd 100644 --- a/test/mock/services_abilitymgr_test/libs/appexecfwk_core/BUILD.gn +++ b/test/mock/services_abilitymgr_test/libs/appexecfwk_core/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -27,6 +27,7 @@ config("appexecfwk_core_mock_config") { "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit/include/", "${ability_runtime_services_path}/common/include", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] } ohos_static_library("appexecfwk_appmgr_mock") { diff --git a/test/moduletest/app_mgr_client_test/BUILD.gn b/test/moduletest/app_mgr_client_test/BUILD.gn index 9a3c1e9e3ed30f6138aa90577216a64a8df50dff..a05d6c24a7030265ebaf049ce39883d5d95e0602 100644 --- a/test/moduletest/app_mgr_client_test/BUILD.gn +++ b/test/moduletest/app_mgr_client_test/BUILD.gn @@ -18,7 +18,12 @@ module_output_path = "ability_runtime/ability_runtime/mstabilitymgrservice" ohos_moduletest("app_mgr_client_test") { module_out_path = module_output_path - + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + blocklist = "../../cfi_blocklist.txt" + } include_dirs = [ "${ability_runtime_test_path}/mock/common/include", "${ability_runtime_test_path}/mock/mock_sa_call", diff --git a/test/moduletest/appexecfwk_appkit_native_app_module_test/BUILD.gn b/test/moduletest/appexecfwk_appkit_native_app_module_test/BUILD.gn index 2ea05cc62b15ec82d757feb0570a87d7ec623e5d..f96a6fd3474d431c88507081ede6d8c816f525ec 100644 --- a/test/moduletest/appexecfwk_appkit_native_app_module_test/BUILD.gn +++ b/test/moduletest/appexecfwk_appkit_native_app_module_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -25,7 +25,7 @@ config("module_private_config") { "${ability_runtime_test_path}/mock/frameworks_kits_appkit_test/include", "${ability_runtime_path}/interfaces/kits/native/appkit/app", ] - + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] defines = [ "AMS_LOG_TAG = \"ApplicationModuleTest\"" ] } diff --git a/test/moduletest/mission_dump_test/BUILD.gn b/test/moduletest/mission_dump_test/BUILD.gn index 477a5aa18a91701ee559cdde3ea6bfd1e230a011..22fbfd20179fdd39bd0cbacd108b79d01c05f8cf 100644 --- a/test/moduletest/mission_dump_test/BUILD.gn +++ b/test/moduletest/mission_dump_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -29,6 +29,7 @@ ohos_moduletest("mission_dump_test") { sources += [ "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp" ] configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config", ] diff --git a/test/moduletest/mock/include/mock_configuration_observer.h b/test/moduletest/mock/include/mock_configuration_observer.h index 16613959381f779150f0f0c79e273b2eaaa2fec7..3d5e90db205f27a2cbfb0e29c990cb7c05ed3f04 100644 --- a/test/moduletest/mock/include/mock_configuration_observer.h +++ b/test/moduletest/mock/include/mock_configuration_observer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -27,9 +27,10 @@ public: MockConfigurationObserver() = default; virtual ~MockConfigurationObserver() = default; - virtual void OnConfigurationUpdated(const Configuration& configuration) override + ErrCode OnConfigurationUpdated(const Configuration& configuration) override { GTEST_LOG_(INFO) << "OnConfigurationUpdated"; + return ERR_OK; } }; } // namespace AppExecFwk diff --git a/test/unittest/ability_auto_startup_service_second_test/BUILD.gn b/test/unittest/ability_auto_startup_service_second_test/BUILD.gn index 03625ff86a4cdc3bbcc667baf8c3ca2e1f16f981..d23c3afd26b88f2b30770907cb36a853d026bdd9 100644 --- a/test/unittest/ability_auto_startup_service_second_test/BUILD.gn +++ b/test/unittest/ability_auto_startup_service_second_test/BUILD.gn @@ -37,7 +37,7 @@ ohos_unittest("ability_auto_startup_service_second_test") { "mock/src/mock_permission_verification.cpp", ] - configs = [] + configs = [ ] cflags = [ "-Dprivate = public", diff --git a/test/unittest/ability_auto_startup_service_test/BUILD.gn b/test/unittest/ability_auto_startup_service_test/BUILD.gn index d22348615854f00dabb9bf331e1a7b5b85eab4a6..293e1f96f4720351bba9f5cd8ea8fe7e61664c6f 100644 --- a/test/unittest/ability_auto_startup_service_test/BUILD.gn +++ b/test/unittest/ability_auto_startup_service_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -35,7 +35,7 @@ ohos_unittest("ability_auto_startup_service_test") { "mock/src/mock_permission_verification.cpp", ] - configs = [] + configs = [ ] deps = [ "${ability_runtime_abilitymgr_path}/:abilityms", diff --git a/test/unittest/ability_bundle_event_callback_test/BUILD.gn b/test/unittest/ability_bundle_event_callback_test/BUILD.gn index b59638976588616ce35a4eea9b3865b2149e87ef..9ad596515df91660ef5c338cbe5122212accce1d 100644 --- a/test/unittest/ability_bundle_event_callback_test/BUILD.gn +++ b/test/unittest/ability_bundle_event_callback_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -43,7 +43,9 @@ ohos_unittest("ability_bundle_event_callback_test") { "ability_bundle_event_callback_test.cpp", ] - configs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config" ] + configs = [ + "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config", + ] deps = [ "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", diff --git a/test/unittest/ability_interceptor_second_test/BUILD.gn b/test/unittest/ability_interceptor_second_test/BUILD.gn index fe695b8b0345c3f4df00f18777a1bc1651336bd3..1745bde8931a9c7fe58f9b898c48b1565372d2da 100644 --- a/test/unittest/ability_interceptor_second_test/BUILD.gn +++ b/test/unittest/ability_interceptor_second_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -36,6 +36,7 @@ ohos_unittest("ability_interceptor_second_test") { ] configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config", ] diff --git a/test/unittest/ability_interceptor_test/BUILD.gn b/test/unittest/ability_interceptor_test/BUILD.gn index 4a521a595b556611a652879ffd6954e1558c96eb..b83eb156d6027afea7b056ec544ae25d19742157 100644 --- a/test/unittest/ability_interceptor_test/BUILD.gn +++ b/test/unittest/ability_interceptor_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -36,6 +36,7 @@ ohos_unittest("ability_interceptor_test") { ] configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config", ] diff --git a/test/unittest/ability_interceptor_third_test/BUILD.gn b/test/unittest/ability_interceptor_third_test/BUILD.gn index 301cbdc2713ebb03724b0d42809218230fba148f..c0a1a24156620e55ec650d3bddd3bcf0788d2c6e 100644 --- a/test/unittest/ability_interceptor_third_test/BUILD.gn +++ b/test/unittest/ability_interceptor_third_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -37,6 +37,7 @@ ohos_unittest("ability_interceptor_third_test") { ] configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config", ] diff --git a/test/unittest/ability_keep_alive_service_test/BUILD.gn b/test/unittest/ability_keep_alive_service_test/BUILD.gn index 13fa83bf9186c12675dfdefe7e08c21d055b76ed..7bf21b869748614fc2ace5721b28eb4eaf193864 100644 --- a/test/unittest/ability_keep_alive_service_test/BUILD.gn +++ b/test/unittest/ability_keep_alive_service_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -32,8 +32,8 @@ ohos_unittest("ability_keep_alive_service_test") { "ability_keep_alive_service_test.cpp", "mock/src/ability_keep_alive_data_manager.cpp", ] - - configs = [] + + configs = [ ] deps = [ "${ability_runtime_abilitymgr_path}/:abilityms", diff --git a/test/unittest/ability_manager_client_branch_second_test/BUILD.gn b/test/unittest/ability_manager_client_branch_second_test/BUILD.gn index ccd62f0691ec73b9d716c77f4a8720aa606e5068..ed26d0ea3471e407a367fbd88169df30f1b95d72 100644 --- a/test/unittest/ability_manager_client_branch_second_test/BUILD.gn +++ b/test/unittest/ability_manager_client_branch_second_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -31,6 +31,7 @@ ohos_unittest("ability_manager_client_branch_second_test") { ] configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config", ] diff --git a/test/unittest/ability_manager_client_branch_test/BUILD.gn b/test/unittest/ability_manager_client_branch_test/BUILD.gn index 44a1bc89fc60cad5d7c71fc5c16ed03da054f984..630f8bb4e8a0fee8d15419f337f60157aa5efa25 100644 --- a/test/unittest/ability_manager_client_branch_test/BUILD.gn +++ b/test/unittest/ability_manager_client_branch_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -31,6 +31,7 @@ ohos_unittest("ability_manager_client_branch_test") { ] configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config", ] diff --git a/test/unittest/ability_manager_client_branch_third_test/BUILD.gn b/test/unittest/ability_manager_client_branch_third_test/BUILD.gn index 4d464465ef5874bdd52dee0de2279be4f08a208d..922121178fa9f33660b05869022306eacb239d29 100644 --- a/test/unittest/ability_manager_client_branch_third_test/BUILD.gn +++ b/test/unittest/ability_manager_client_branch_third_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -35,6 +35,7 @@ ohos_unittest("ability_manager_client_branch_third_test") { ] configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config", ] diff --git a/test/unittest/ability_manager_service_account_test/BUILD.gn b/test/unittest/ability_manager_service_account_test/BUILD.gn index 50b623e31ee7616f183b854c8ee2a8146359b0b2..ebc00d6764146ae76955a2dfbe39df0027e84436 100644 --- a/test/unittest/ability_manager_service_account_test/BUILD.gn +++ b/test/unittest/ability_manager_service_account_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -33,7 +33,10 @@ ohos_unittest("ability_manager_service_account_test") { "ability_manager_service_account_test.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/ability_manager_service_dialog_test/BUILD.gn b/test/unittest/ability_manager_service_dialog_test/BUILD.gn index 199946f618dededd17da2cdb92b56b01bad8027c..7f105c869f2fa6268a5c67b2adaa672b2e11e85e 100644 --- a/test/unittest/ability_manager_service_dialog_test/BUILD.gn +++ b/test/unittest/ability_manager_service_dialog_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -23,7 +23,9 @@ ohos_unittest("ability_manager_service_dialog_test") { sources = [ "ability_manager_service_dialog_test.cpp" ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] deps = [ "${ability_runtime_services_path}/abilitymgr:abilityms" ] diff --git a/test/unittest/ability_record_first_test/BUILD.gn b/test/unittest/ability_record_first_test/BUILD.gn index 2c22b6f5faa119dd2ab368882d7cd744c9f88bd7..421983b8eaba466d21f91cda04c11e4e5aee6d23 100644 --- a/test/unittest/ability_record_first_test/BUILD.gn +++ b/test/unittest/ability_record_first_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -32,7 +32,9 @@ ohos_unittest("ability_record_first_test") { "ability_record_first_test.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/ability_record_second_test/BUILD.gn b/test/unittest/ability_record_second_test/BUILD.gn index 9d189c1da0a694e1de55410bd890b279d26ec2c3..ba45c6726a44b06d303ab3450e584d265ecbb8e9 100644 --- a/test/unittest/ability_record_second_test/BUILD.gn +++ b/test/unittest/ability_record_second_test/BUILD.gn @@ -39,7 +39,9 @@ ohos_unittest("ability_record_second_test") { "mock/src/mock_scene_board_judgement.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [ "-Dprivate=public", diff --git a/test/unittest/ability_stage_context_test/BUILD.gn b/test/unittest/ability_stage_context_test/BUILD.gn index 73a3326a352d8c2c12fa1f2e8b6a152cb2f23006..0863e095a52e9aa47748c19f7b908916e3f5ac20 100644 --- a/test/unittest/ability_stage_context_test/BUILD.gn +++ b/test/unittest/ability_stage_context_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -28,7 +28,10 @@ ohos_unittest("ability_stage_context_test") { sources = [ "ability_stage_context_test.cpp" ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/unittest/ability_start_window_option_test/BUILD.gn b/test/unittest/ability_start_window_option_test/BUILD.gn index 6eed69aa6c830f66b442169b6cebea43a90c21f3..d463c90f40722c3e9dbd98d05e37c2f46289e0f4 100644 --- a/test/unittest/ability_start_window_option_test/BUILD.gn +++ b/test/unittest/ability_start_window_option_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -28,7 +28,7 @@ ohos_unittest("ability_start_window_option_test") { sources = [ "ability_start_window_option_test.cpp" ] - configs = [] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", diff --git a/test/unittest/ams_app_running_record_test/BUILD.gn b/test/unittest/ams_app_running_record_test/BUILD.gn index f14a268f81d77deda98a0cc84ea883387857bb53..3fe04bb161d6e5fc6ec6c3647f522f2f3da3b5dd 100644 --- a/test/unittest/ams_app_running_record_test/BUILD.gn +++ b/test/unittest/ams_app_running_record_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -40,7 +40,10 @@ ohos_unittest("AmsAppRunningRecordTest") { "ams_app_running_record_test.cpp", ] - configs = [ "${ability_runtime_services_path}/common:common_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/common:common_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/unittest/ams_mgr_proxy_test/BUILD.gn b/test/unittest/ams_mgr_proxy_test/BUILD.gn index 97ea0ca6f6c1bd487258bd2a893df30606e78261..ab692388f3a9f96a3189e02976cd5773f4657858 100644 --- a/test/unittest/ams_mgr_proxy_test/BUILD.gn +++ b/test/unittest/ams_mgr_proxy_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -32,6 +32,8 @@ ohos_unittest("AmsMgrProxyTest") { sources = [ "ams_mgr_proxy_test.cpp" ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] + deps = [ "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/appmgr:libappms", diff --git a/test/unittest/app_launch_data_test/BUILD.gn b/test/unittest/app_launch_data_test/BUILD.gn index e0148f96fc5a4b2875bae49b91b4d00960137446..71de17dd68d4779d0b482c6966c08b7e5adde011 100644 --- a/test/unittest/app_launch_data_test/BUILD.gn +++ b/test/unittest/app_launch_data_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -26,6 +26,8 @@ ohos_unittest("app_launch_data_test") { sources = [ "app_launch_data_test.cpp" ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] + deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", diff --git a/test/unittest/app_mgr_service_inner_eighth_test/BUILD.gn b/test/unittest/app_mgr_service_inner_eighth_test/BUILD.gn index 041b4ea9eb9b32e2bf1c9833b9b7a64a89d8e916..6f596afeaa9852b6ece72e8b43b87554b33c7b5c 100644 --- a/test/unittest/app_mgr_service_inner_eighth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_eighth_test/BUILD.gn @@ -87,7 +87,7 @@ ohos_unittest("app_mgr_service_inner_eighth_test") { "mock/src/mock_user_record_manager.cpp", ] - configs = [] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", diff --git a/test/unittest/app_mgr_service_inner_fifth_test/BUILD.gn b/test/unittest/app_mgr_service_inner_fifth_test/BUILD.gn index 3b3d01c193ec3cff3c6feb33406a532fc57990df..51446b8b2bbdb2b300267c4bf9ff8d5d8ce07328 100644 --- a/test/unittest/app_mgr_service_inner_fifth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_fifth_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -45,7 +45,10 @@ ohos_unittest("AppMgrServiceInnerFifthTest") { "app_mgr_service_inner_fifth_test.cpp", ] - configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/appmgr:appmgr_config", + ] deps = [ "${ability_runtime_path}/utils/server/startup:startup_util", diff --git a/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn b/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn index ba15d4f49525168df1af20b9aa3e1b8199092271..503ea10f94dd4383868e535bb84ecbb08ee97bd2 100644 --- a/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn @@ -44,7 +44,10 @@ ohos_unittest("AppMgrServiceInnerFourthTest") { "mock/src/mock_permission_verification.cpp", ] - configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/appmgr:appmgr_config", + ] cflags = [ "-Dprivate=public", diff --git a/test/unittest/app_mgr_service_inner_mock_test/BUILD.gn b/test/unittest/app_mgr_service_inner_mock_test/BUILD.gn index 2ac11e3423a5afa901e5ef8d0c3c2e3170688f15..dc145f3adafac85b766eaa45956477769d803b14 100644 --- a/test/unittest/app_mgr_service_inner_mock_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_mock_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -43,6 +43,8 @@ ohos_unittest("app_mgr_service_inner_mock_test") { "src/window_manager.cpp", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] + deps = [] external_deps = [ diff --git a/test/unittest/app_mgr_service_inner_second_test/BUILD.gn b/test/unittest/app_mgr_service_inner_second_test/BUILD.gn index 4642c2ac9f2c042c325e9d23e4d0dd908d933973..fb5fba22eee88b25cb3cefcefb6119f54c787d78 100644 --- a/test/unittest/app_mgr_service_inner_second_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_second_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -53,7 +53,10 @@ ohos_unittest("AppMgrServiceInnerSecondTest") { "mock/src/mock_permission_verification.cpp", ] - configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/appmgr:appmgr_config", + ] deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", diff --git a/test/unittest/app_mgr_service_inner_seventh_test/BUILD.gn b/test/unittest/app_mgr_service_inner_seventh_test/BUILD.gn index 773704f9c646761ef8b269e38e645dca12f364db..baaa9ebe8ea840077b388990af50766c814010da 100644 --- a/test/unittest/app_mgr_service_inner_seventh_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_seventh_test/BUILD.gn @@ -86,7 +86,7 @@ ohos_unittest("app_mgr_service_inner_seventh_test") { "mock/src/mock_user_record_manager.cpp", ] - configs = [] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", diff --git a/test/unittest/app_mgr_service_inner_sixth_test/BUILD.gn b/test/unittest/app_mgr_service_inner_sixth_test/BUILD.gn index 6bd784b776aecc6881cd42b3f6b1a5f9a67d6f5e..b17fa78f1c7733adee896dc6178d993f3e293a30 100644 --- a/test/unittest/app_mgr_service_inner_sixth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_sixth_test/BUILD.gn @@ -45,7 +45,10 @@ ohos_unittest("app_mgr_service_inner_sixth_test") { "mock/src/mock_permission_verification.cpp", ] - configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/appmgr:appmgr_config", + ] deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", diff --git a/test/unittest/app_mgr_service_inner_test/BUILD.gn b/test/unittest/app_mgr_service_inner_test/BUILD.gn index 300025bcefe46dab3ca56683b7392d0a7b05e965..98679cf85cd7d95992ec550ea8c5e7d44a8c00ba 100644 --- a/test/unittest/app_mgr_service_inner_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -44,7 +44,10 @@ ohos_unittest("AppMgrServiceInnerTest") { "app_mgr_service_inner_test.cpp", ] - configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/appmgr:appmgr_config", + ] deps = [ "${ability_runtime_path}/utils/server/startup:startup_util", diff --git a/test/unittest/app_native_spawn_manager_test/BUILD.gn b/test/unittest/app_native_spawn_manager_test/BUILD.gn index 42099f9b689aa251da89cca1e96ca0d6a9fa236f..a954233dd9326ec42daa9a42ffd70e564b64411d 100644 --- a/test/unittest/app_native_spawn_manager_test/BUILD.gn +++ b/test/unittest/app_native_spawn_manager_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2025 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 @@ -19,7 +19,10 @@ module_output_path = "ability_runtime/ability_runtime/appmgrservice" ohos_unittest("app_native_spawn_manager_test") { module_out_path = module_output_path - configs = [ "${ability_runtime_services_path}/common:common_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/common:common_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/unittest/app_preloader_test/BUILD.gn b/test/unittest/app_preloader_test/BUILD.gn index e271f94abcbddec64cbed76f09af70efe866f520..38cb4d8cfd4cbf2fcdd25c7666e88cfd5d027649 100755 --- a/test/unittest/app_preloader_test/BUILD.gn +++ b/test/unittest/app_preloader_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2025 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 @@ -19,7 +19,10 @@ module_output_path = "ability_runtime/ability_runtime/appmgrservice" ohos_unittest("app_preloader_test") { module_out_path = module_output_path - configs = [ "${ability_runtime_services_path}/common:common_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/common:common_config", + ] include_dirs = [ "include", diff --git a/test/unittest/app_scheduler_host_test/BUILD.gn b/test/unittest/app_scheduler_host_test/BUILD.gn index 41437905c0c159f3b439066d1f633edf040add85..7cc227466339f4bdfd790025dd2aad2d3460e8b1 100644 --- a/test/unittest/app_scheduler_host_test/BUILD.gn +++ b/test/unittest/app_scheduler_host_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -20,6 +20,7 @@ ohos_unittest("app_scheduler_host_test") { module_out_path = module_output_path configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/common:common_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] diff --git a/test/unittest/app_scheduler_proxy_test/BUILD.gn b/test/unittest/app_scheduler_proxy_test/BUILD.gn index 158d13e88fa9a643dfa833a41bfe7753bf8186e1..b55c8ddb0a6646b4c171af5e8e777b890f7ecb34 100644 --- a/test/unittest/app_scheduler_proxy_test/BUILD.gn +++ b/test/unittest/app_scheduler_proxy_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -20,6 +20,7 @@ ohos_unittest("app_scheduler_proxy_test") { module_out_path = module_output_path configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", "${ability_runtime_services_path}/common:common_config", "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] diff --git a/test/unittest/app_state_observer_manager_test/BUILD.gn b/test/unittest/app_state_observer_manager_test/BUILD.gn index 44be34d331acf67b4cf788744e5ff9448b00bdff..8ea2c00e714f30eba0077d33ca6e64e73cbdf082 100755 --- a/test/unittest/app_state_observer_manager_test/BUILD.gn +++ b/test/unittest/app_state_observer_manager_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -34,7 +34,10 @@ ohos_unittest("app_state_observer_manager_test") { sources += [ "app_state_observer_manager_test.cpp" ] - configs = [ "${ability_runtime_test_path}/unittest:appmgr_test_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_test_path}/unittest:appmgr_test_config", + ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/app_state_observer_manager_test_second/BUILD.gn b/test/unittest/app_state_observer_manager_test_second/BUILD.gn index 3d4392147642abcfbf3d67062482596c617f5fcf..eca29c7895b3072fb138f554a7b4f1e882c223b8 100755 --- a/test/unittest/app_state_observer_manager_test_second/BUILD.gn +++ b/test/unittest/app_state_observer_manager_test_second/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -34,7 +34,10 @@ ohos_unittest("app_state_observer_manager_test_second") { sources += [ "app_state_observer_manager_test_second.cpp" ] - configs = [ "${ability_runtime_test_path}/unittest:appmgr_test_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_test_path}/unittest:appmgr_test_config", + ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/auto_startup_info_test/BUILD.gn b/test/unittest/auto_startup_info_test/BUILD.gn index 3b55c6f4e2e6851bbd17d193299d04554171cbbb..d0430f1bb1b58d4476ff0f1b1844d5da762259bb 100644 --- a/test/unittest/auto_startup_info_test/BUILD.gn +++ b/test/unittest/auto_startup_info_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -30,7 +30,7 @@ ohos_unittest("auto_startup_info_test") { "auto_startup_info_test.cpp", ] - configs = [] + configs = [ ] deps = [ "${ability_runtime_abilitymgr_path}/:abilityms", diff --git a/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_proxy_test/BUILD.gn b/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_proxy_test/BUILD.gn index 69e91415a58efe62c0d1f43f715785e22307da88..995717d62d55ec4fb3167f1876cd263ef3a5706b 100644 --- a/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_proxy_test/BUILD.gn +++ b/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_proxy_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -49,6 +49,7 @@ config("ability_config") { "${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/kits", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_test/BUILD.gn b/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_test/BUILD.gn index 21b23e0f964446e55a81db3ef2182d56f051f143..040be09fbc8611e846e9d1e874f4693ce9bc4137 100644 --- a/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_test/BUILD.gn +++ b/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -49,6 +49,7 @@ config("ability_config") { "${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/kits", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/dfr_test/appfreeze_inner_test/BUILD.gn b/test/unittest/dfr_test/appfreeze_inner_test/BUILD.gn index 087d5d57b38146af3db0f6aa15ffed295f768cb9..27d31e47fb3cbe2ea71086f1e7fea9346acb17a4 100644 --- a/test/unittest/dfr_test/appfreeze_inner_test/BUILD.gn +++ b/test/unittest/dfr_test/appfreeze_inner_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -27,6 +27,7 @@ config("module_context_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", "${ability_runtime_path}/interfaces/kits/native/ability/native", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/dfr_test/appfreeze_manager_test/BUILD.gn b/test/unittest/dfr_test/appfreeze_manager_test/BUILD.gn index 9bdb269886e1386d30e7298db8db242df0993a25..a5673bce196ad8eccd56fb8d6db8284bfed6ed42 100644 --- a/test/unittest/dfr_test/appfreeze_manager_test/BUILD.gn +++ b/test/unittest/dfr_test/appfreeze_manager_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -27,6 +27,7 @@ config("module_context_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", "${ability_runtime_path}/interfaces/kits/native/ability/native", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/dfr_test/appfreeze_state_test/BUILD.gn b/test/unittest/dfr_test/appfreeze_state_test/BUILD.gn index 642724b8179cbc30aa40f81d78a091996deee606..faf2d265cfb43100130fb43185a38469e0099c89 100644 --- a/test/unittest/dfr_test/appfreeze_state_test/BUILD.gn +++ b/test/unittest/dfr_test/appfreeze_state_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -27,6 +27,7 @@ config("module_context_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", "${ability_runtime_path}/interfaces/kits/native/ability/native", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/dfr_test/watchdog_test/BUILD.gn b/test/unittest/dfr_test/watchdog_test/BUILD.gn index 7d977ca14785d8bdd9e5f2bf001f48a3bcf0deb2..60bd875ff77731435d2d1e010be2dfcd8c437c75 100644 --- a/test/unittest/dfr_test/watchdog_test/BUILD.gn +++ b/test/unittest/dfr_test/watchdog_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -27,6 +27,7 @@ config("module_context_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", "${ability_runtime_path}/interfaces/kits/native/ability/native", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/ecological_rule_interceptor_test/BUILD.gn b/test/unittest/ecological_rule_interceptor_test/BUILD.gn index 85e1abcf7e6128ca53d8db71edd59cf4f70a0058..802c59b5f32284d91f4340810b59516145723f1e 100644 --- a/test/unittest/ecological_rule_interceptor_test/BUILD.gn +++ b/test/unittest/ecological_rule_interceptor_test/BUILD.gn @@ -35,6 +35,8 @@ ohos_unittest("ecological_rule_interceptor_test") { ] configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config", ] cflags = [ diff --git a/test/unittest/extension_control_interceptor_test/BUILD.gn b/test/unittest/extension_control_interceptor_test/BUILD.gn index 7562440b90968072720b162db3bacc0c22bbff9d..c515d8cdede3f5c1d224873f17d422af17d67437 100644 --- a/test/unittest/extension_control_interceptor_test/BUILD.gn +++ b/test/unittest/extension_control_interceptor_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -30,7 +30,10 @@ ohos_unittest("extension_control_interceptor_test") { ] cflags = [] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper", diff --git a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn index 475cb31348ad87bfb25212c2eadea84272afab33..5d925fec2def0a8ac08a60bfbb6622740541e09d 100644 --- a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn @@ -43,6 +43,7 @@ config("module_private_config") { "${ability_runtime_test_path}/mock/services_appmgr_test/include", "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -60,6 +61,7 @@ config("module_ability_context_config") { "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_path}/interfaces/kits/native/appkit/app", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn index bea5089ae746e30037f88870954e304eaa757e26..ba9efa0698141827619219e061ed9eb4fc112bea 100644 --- a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn @@ -28,6 +28,7 @@ config("module_private_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", "${ability_runtime_path}/interfaces/kits/native/appkit/app_startup", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -46,6 +47,7 @@ config("module_context_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app_startup", "${ability_runtime_path}/interfaces/kits/native/ability/native", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -894,7 +896,9 @@ ohos_unittest("assert_fault_test") { "assert_fault_task_thread_test.cpp", ] - configs = [ ":module_private_config" ] + configs = [ + ":module_private_config", + ] deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", @@ -1017,7 +1021,9 @@ ohos_unittest("idle_time_test") { "idle_time_test.cpp", ] - configs = [ ":module_context_config" ] + configs = [ + ":module_context_config", + ] deps = [ "${ability_runtime_native_path}/appkit:appkit_native" ] diff --git a/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn index 83f137e6c1d208785d5b1910fe76a51cbc6b7832..d459e412824f13b2fe63e6734b98378ae28ecfd0 100644 --- a/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn @@ -39,7 +39,10 @@ ohos_unittest("insight_intent_execute_manager_second_test") { "insight_intent_execute_manager_second_test.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [ "-Dprivate=public", diff --git a/test/unittest/insight_intent_rdb_data_manager_test/BUILD.gn b/test/unittest/insight_intent_rdb_data_manager_test/BUILD.gn index 7c16d94a8ae68d206e0f543559bce74f16e89f3a..1ba808a2599fc0a48d63be090257f20d0827d4b6 100755 --- a/test/unittest/insight_intent_rdb_data_manager_test/BUILD.gn +++ b/test/unittest/insight_intent_rdb_data_manager_test/BUILD.gn @@ -37,6 +37,8 @@ ohos_unittest("insight_intent_rdb_data_manager_test") { "insight_intent_rdb_data_manager_test.cpp" ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] + deps = [ "${ability_runtime_abilitymgr_path}/:abilityms" ] external_deps = [ diff --git a/test/unittest/js_app_service_extension_test/BUILD.gn b/test/unittest/js_app_service_extension_test/BUILD.gn index 20e52cd81c4b5ba7c0a081b79104222a5209e854..bd71667e6854ccca65da7d37ba632fb6ca33300b 100644 --- a/test/unittest/js_app_service_extension_test/BUILD.gn +++ b/test/unittest/js_app_service_extension_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -33,7 +33,10 @@ ohos_unittest("js_app_service_extension_test") { "js_app_service_extension_test.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] deps = [ "${ability_runtime_native_path}/ability/native:app_service_extension", "${ability_runtime_native_path}/ability/native:insight_intent_executor", diff --git a/test/unittest/js_auto_fill_extension_test/BUILD.gn b/test/unittest/js_auto_fill_extension_test/BUILD.gn index b1fdcd9108103130b1362d2d9f699a4af443c5c0..19c9a9d1785d06d1445a3e8561c0928ee0ef3575 100644 --- a/test/unittest/js_auto_fill_extension_test/BUILD.gn +++ b/test/unittest/js_auto_fill_extension_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 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 @@ -31,7 +31,10 @@ ohos_unittest("js_auto_fill_extension_test") { sources = [ "js_auto_fill_extension_test.cpp" ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] deps = [ "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:ui_extension", diff --git a/test/unittest/js_photo_editor_extension_context_test/BUILD.gn b/test/unittest/js_photo_editor_extension_context_test/BUILD.gn index 977eb29d2bffdef30c156ad4cf958bcfa4ab0259..7d79cbe0937a930ad2590eb44f1c4a7167f7eec9 100644 --- a/test/unittest/js_photo_editor_extension_context_test/BUILD.gn +++ b/test/unittest/js_photo_editor_extension_context_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -34,6 +34,7 @@ config("module_private_config") { "${ability_runtime_test_path}/mock/services_appmgr_test/include", "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -56,6 +57,7 @@ config("module_ability_context_config") { "//third_party/libuv/include", "${global_path}/resource_management/interfaces/inner_api/include", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/js_photo_editor_extension_impl_test/BUILD.gn b/test/unittest/js_photo_editor_extension_impl_test/BUILD.gn index e2e9c578dbc489244fdd1fa5af30d0ea7271ea95..a1b2edd3d1c5ae4d2bebf1abbd8357a5f86a0944 100644 --- a/test/unittest/js_photo_editor_extension_impl_test/BUILD.gn +++ b/test/unittest/js_photo_editor_extension_impl_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -34,6 +34,7 @@ config("module_private_config") { "${ability_runtime_test_path}/mock/services_appmgr_test/include", "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -56,6 +57,7 @@ config("module_ability_context_config") { "//third_party/libuv/include", "${global_path}/resource_management/interfaces/inner_api/include", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/js_service_extension_test/BUILD.gn b/test/unittest/js_service_extension_test/BUILD.gn index 62484ae5ad5760cc46a5a7cc07aa4395013a858d..039d5afd2abe349aa270c15cf9a8439d848e020c 100644 --- a/test/unittest/js_service_extension_test/BUILD.gn +++ b/test/unittest/js_service_extension_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -33,7 +33,10 @@ ohos_unittest("js_service_extension_test") { "js_service_extension_test.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] deps = [ "${ability_runtime_native_path}/ability/native:insight_intent_executor", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", diff --git a/test/unittest/photo_editor_extension_a_test/BUILD.gn b/test/unittest/photo_editor_extension_a_test/BUILD.gn index ec17657ea56c284bd1c35dfc01c2618aa9b8f9f3..0463fd30108816949cf39d85a83e76daa25e8374 100644 --- a/test/unittest/photo_editor_extension_a_test/BUILD.gn +++ b/test/unittest/photo_editor_extension_a_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -34,6 +34,7 @@ config("module_private_config") { "${ability_runtime_test_path}/mock/services_appmgr_test/include", "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -54,6 +55,7 @@ config("module_ability_context_config") { "//third_party/libuv/include", "${global_path}/resource_management/interfaces/inner_api/include", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/photo_editor_extension_test/BUILD.gn b/test/unittest/photo_editor_extension_test/BUILD.gn index 5b7855ace25653ecc3d73141db239aa9c6f4bf78..59497251e53383014de671ab7b691862171857b0 100644 --- a/test/unittest/photo_editor_extension_test/BUILD.gn +++ b/test/unittest/photo_editor_extension_test/BUILD.gn @@ -34,6 +34,7 @@ config("module_private_config") { "${ability_runtime_test_path}/mock/services_appmgr_test/include", "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -56,6 +57,7 @@ config("module_ability_context_config") { "//third_party/libuv/include", "${global_path}/resource_management/interfaces/inner_api/include", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] diff --git a/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn b/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn index 1fd9584209a76bc32b41eddffe62969cdb90c841..e476b72c4e16762121a5692ec296373ef21d06fe 100644 --- a/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn +++ b/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -58,7 +58,10 @@ ohos_unittest("extension_record_manager_second_test") { "mock/src/mock_permission_verification.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn b/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn index 8619df37f748e73558b55238bf4848b6c6a92ddc..e86677cffc298266cd629896f3b41cffa94f59b4 100755 --- a/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn +++ b/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -53,7 +53,10 @@ ohos_unittest("extension_record_manager_test") { "extension_record_manager_test.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/unittest/ui_extension/ui_extension_get_host_info_test/BUILD.gn b/test/unittest/ui_extension/ui_extension_get_host_info_test/BUILD.gn index 48b493a8417e402a0713cad1730adddadbac3aa6..07f2bfcf5f11db64c9e69da2c7e2eb152c5adda4 100644 --- a/test/unittest/ui_extension/ui_extension_get_host_info_test/BUILD.gn +++ b/test/unittest/ui_extension/ui_extension_get_host_info_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -31,7 +31,10 @@ ohos_unittest("ui_extension_get_host_info_test") { "ui_extension_get_host_info_test.cpp", ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config", + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] cflags = [] if (target_cpu == "arm") { diff --git a/test/unittest/ui_extension_record_test/BUILD.gn b/test/unittest/ui_extension_record_test/BUILD.gn index 78ef2b687229e11f88199ef5dcc64fdd4372da58..e238e368025b120aced89730a25952680b1e871d 100644 --- a/test/unittest/ui_extension_record_test/BUILD.gn +++ b/test/unittest/ui_extension_record_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -33,6 +33,8 @@ ohos_unittest("ui_extension_record_test") { "ui_extension_record_test.cpp", ] + configs = [ ] + deps = [ "${ability_runtime_abilitymgr_path}/:abilityms" ] external_deps = [ diff --git a/test/unittest/update_caller_info_util_test/BUILD.gn b/test/unittest/update_caller_info_util_test/BUILD.gn index 044e695e8ad6cdf7de8b7585b0c24488b7a1d06b..e56f833dcdb2f4a474d044248ffcbcef245a161c 100644 --- a/test/unittest/update_caller_info_util_test/BUILD.gn +++ b/test/unittest/update_caller_info_util_test/BUILD.gn @@ -39,7 +39,9 @@ ohos_unittest("update_caller_info_util_test") { "update_caller_info_util_test.cpp" ] - configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + configs = [ + "${ability_runtime_services_path}/abilitymgr:abilityms_config", + ] deps = [ "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", diff --git a/test/unittest/want_utils_test/BUILD.gn b/test/unittest/want_utils_test/BUILD.gn index 8f4deb61625e4474910b9e295de87110dfd8d45b..d435950c254d2994fa313bcd43a1b4c4d5eaa1c8 100644 --- a/test/unittest/want_utils_test/BUILD.gn +++ b/test/unittest/want_utils_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 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 @@ -39,6 +39,8 @@ ohos_unittest("want_utils_test") { "want_utils_test.cpp", ] + configs = [ ] + deps = [ "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", diff --git a/tools/aa/BUILD.gn b/tools/aa/BUILD.gn index d6ec4e440c24ab088a7c976c62ade9d8402e6b8c..a75b6872837fc1ef4b6074a3832a03e73654866e 100644 --- a/tools/aa/BUILD.gn +++ b/tools/aa/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -21,6 +21,7 @@ config("ability_command_config") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] } config("ability_command_exception_config") {