diff --git a/aafwk.gni b/aafwk.gni index e9915453..c0968f9d 100644 --- a/aafwk.gni +++ b/aafwk.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. +# Copyright (c) 2021-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 @@ -12,7 +12,7 @@ # limitations under the License. aafwk_path = "//foundation/aafwk/standard" -appexecfwk_path = "//foundation/bundlemanager/bundle_framework" +bundlefwk_path = "//foundation/bundlemanager/bundle_framework" multimedia_path = "//foundation/multimedia/image_standard" services_path = "//foundation/aafwk/standard/services" multimodalinput_path = "//foundation/multimodalinput/input" @@ -24,17 +24,17 @@ notification_path = "//base/notification" distributeddatamgr_path = "//foundation/distributeddatamgr" kits_path = "//foundation/aafwk/standard/frameworks/kits" innerkits_path = "//foundation/aafwk/standard/interfaces/innerkits" -appexecfwk_innerkits_path = "${appexecfwk_path}/interfaces/innerkits" -appexecfwk_inner_api_path = "${appexecfwk_path}/interfaces/inner_api" +bundlefwk_innerkits_path = "${bundlefwk_path}/interfaces/innerkits" +bundlefwk_inner_api_path = "${bundlefwk_path}/interfaces/inner_api" ans_core_path = "//base/notification/ans_standard/frameworks/ans/core" system_test_app_path = "//foundation/aafwk/standard/test/resource/amssystemtestability/abilitySrc" -form_runtime_path = "${aafwk_path}/form_runtime" -form_runtime_napi_path = "${aafwk_path}/form_runtime/frameworks/js/napi" +form_runtime_path = "//foundation/aafwk/standard/form_runtime" +form_runtime_napi_path = "${form_runtime_path}/frameworks/js/napi" -base_path = "//foundation/aafwk/standard/ability_base" -base_inner_api_path = "${base_path}/interfaces/inner_api" -base_native_path = "${base_path}/frameworks/native" +ability_base_path = "//foundation/aafwk/standard/ability_base" +ability_base_innerapi_path = "${ability_base_path}/interfaces/inner_api" +ability_base_native_path = "${ability_base_path}/frameworks/native" declare_args() { background_task_mgr_continuous_task_enable = true diff --git a/ability_base/BUILD.gn b/ability_base/BUILD.gn index 20203ed7..9b37c6d9 100644 --- a/ability_base/BUILD.gn +++ b/ability_base/BUILD.gn @@ -12,9 +12,9 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/ability_base/ability_base.gni") -baseImpl = "${base_path}/frameworks/native" +baseImpl = "${ability_base_path}/frameworks/native" ################################### base ######################################## config("base_config") { @@ -57,7 +57,7 @@ ohos_shared_library("base") { config("configuration_sdk_config") { include_dirs = [ "interfaces/inner_api/configuration/include", - "${innerkits_path}/log/include", + "${ability_runtime_innerapi_path}/log/include", "//third_party/json/include", ] } @@ -133,17 +133,16 @@ config("want_public_config") { visibility = [ ":*" ] include_dirs = [ "//utils/native/base/include", - "${base_inner_api_path}/base/include", - "${base_inner_api_path}/uri/include", - "${base_inner_api_path}/want/include", - "${innerkits_path}/log/include", - "${kits_path}/content/cpp/src", + "${ability_base_innerapi_path}/base/include", + "${ability_base_innerapi_path}/uri/include", + "${ability_base_innerapi_path}/want/include", + "${ability_runtime_innerapi_path}/log/include", "//third_party/jsoncpp/include", "//third_party/json/include", ] } -wantImpl = "${base_native_path}/want/src" +wantImpl = "${ability_base_native_path}/want/src" ohos_shared_library("want") { sources = [ diff --git a/ability_base/ability_base.gni b/ability_base/ability_base.gni new file mode 100755 index 00000000..8e9921cf --- /dev/null +++ b/ability_base/ability_base.gni @@ -0,0 +1,18 @@ +# 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. + +ability_runtime_path = "//foundation/aafwk/standard" +ability_runtime_innerapi_path = "${ability_runtime_path}/interfaces/innerkits" +ability_base_path = "//foundation/aafwk/standard/ability_base" +ability_base_innerapi_path = "${ability_base_path}/interfaces/inner_api" +ability_base_native_path = "${ability_base_path}/frameworks/native" diff --git a/ability_base/frameworks/native/base/src/base.cpp b/ability_base/frameworks/native/base/src/base.cpp index 1a725386..04f3f5d3 100644 --- a/ability_base/frameworks/native/base/src/base.cpp +++ b/ability_base/frameworks/native/base/src/base.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/base/src/base_object.cpp b/ability_base/frameworks/native/base/src/base_object.cpp index 677e49b3..4e3953db 100644 --- a/ability_base/frameworks/native/base/src/base_object.cpp +++ b/ability_base/frameworks/native/base/src/base_object.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/base/src/bool_wrapper.cpp b/ability_base/frameworks/native/base/src/bool_wrapper.cpp index 5ded3bec..0d45dccf 100644 --- a/ability_base/frameworks/native/base/src/bool_wrapper.cpp +++ b/ability_base/frameworks/native/base/src/bool_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/base/src/byte_wrapper.cpp b/ability_base/frameworks/native/base/src/byte_wrapper.cpp index 857c0ab2..b4302f1c 100644 --- a/ability_base/frameworks/native/base/src/byte_wrapper.cpp +++ b/ability_base/frameworks/native/base/src/byte_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/base/src/double_wrapper.cpp b/ability_base/frameworks/native/base/src/double_wrapper.cpp index 3fa97640..c14076f2 100644 --- a/ability_base/frameworks/native/base/src/double_wrapper.cpp +++ b/ability_base/frameworks/native/base/src/double_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/base/src/float_wrapper.cpp b/ability_base/frameworks/native/base/src/float_wrapper.cpp index 47e8b234..a1708946 100644 --- a/ability_base/frameworks/native/base/src/float_wrapper.cpp +++ b/ability_base/frameworks/native/base/src/float_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/base/src/int_wrapper.cpp b/ability_base/frameworks/native/base/src/int_wrapper.cpp index acadda45..32fc2305 100644 --- a/ability_base/frameworks/native/base/src/int_wrapper.cpp +++ b/ability_base/frameworks/native/base/src/int_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/base/src/long_wrapper.cpp b/ability_base/frameworks/native/base/src/long_wrapper.cpp index a0ed3439..dae40106 100644 --- a/ability_base/frameworks/native/base/src/long_wrapper.cpp +++ b/ability_base/frameworks/native/base/src/long_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/base/src/short_wrapper.cpp b/ability_base/frameworks/native/base/src/short_wrapper.cpp index d5c38bae..7412bbd2 100644 --- a/ability_base/frameworks/native/base/src/short_wrapper.cpp +++ b/ability_base/frameworks/native/base/src/short_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/base/src/string_wrapper.cpp b/ability_base/frameworks/native/base/src/string_wrapper.cpp index ec708468..f7abdea2 100644 --- a/ability_base/frameworks/native/base/src/string_wrapper.cpp +++ b/ability_base/frameworks/native/base/src/string_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/base/src/user_object_wrapper.cpp b/ability_base/frameworks/native/base/src/user_object_wrapper.cpp index 2f21364e..57bb2c56 100644 --- a/ability_base/frameworks/native/base/src/user_object_wrapper.cpp +++ b/ability_base/frameworks/native/base/src/user_object_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/base/src/zchar_wrapper.cpp b/ability_base/frameworks/native/base/src/zchar_wrapper.cpp index 7fae4762..ada0e97f 100644 --- a/ability_base/frameworks/native/base/src/zchar_wrapper.cpp +++ b/ability_base/frameworks/native/base/src/zchar_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/want/src/array_wrapper.cpp b/ability_base/frameworks/native/want/src/array_wrapper.cpp index bb2c5238..27bce7fd 100644 --- a/ability_base/frameworks/native/want/src/array_wrapper.cpp +++ b/ability_base/frameworks/native/want/src/array_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/want/src/operation_builder.cpp b/ability_base/frameworks/native/want/src/operation_builder.cpp index 9c689f65..c2276929 100644 --- a/ability_base/frameworks/native/want/src/operation_builder.cpp +++ b/ability_base/frameworks/native/want/src/operation_builder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/want/src/skills.cpp b/ability_base/frameworks/native/want/src/skills.cpp index a343b8a5..70eee360 100644 --- a/ability_base/frameworks/native/want/src/skills.cpp +++ b/ability_base/frameworks/native/want/src/skills.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/frameworks/native/want/src/want_params_wrapper.cpp b/ability_base/frameworks/native/want/src/want_params_wrapper.cpp index 5f927c16..51f56059 100644 --- a/ability_base/frameworks/native/want/src/want_params_wrapper.cpp +++ b/ability_base/frameworks/native/want/src/want_params_wrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/base_def.h b/ability_base/interfaces/inner_api/base/include/base_def.h index 8b2d353c..f6366ed2 100644 --- a/ability_base/interfaces/inner_api/base/include/base_def.h +++ b/ability_base/interfaces/inner_api/base/include/base_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/base_interfaces.h b/ability_base/interfaces/inner_api/base/include/base_interfaces.h index ecccd1ea..791fa007 100644 --- a/ability_base/interfaces/inner_api/base/include/base_interfaces.h +++ b/ability_base/interfaces/inner_api/base/include/base_interfaces.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/base_object.h b/ability_base/interfaces/inner_api/base/include/base_object.h index 58173bef..4cdd481d 100644 --- a/ability_base/interfaces/inner_api/base/include/base_object.h +++ b/ability_base/interfaces/inner_api/base/include/base_object.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/base_types.h b/ability_base/interfaces/inner_api/base/include/base_types.h index e0b02a8c..6e6c8150 100644 --- a/ability_base/interfaces/inner_api/base/include/base_types.h +++ b/ability_base/interfaces/inner_api/base/include/base_types.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/bool_wrapper.h b/ability_base/interfaces/inner_api/base/include/bool_wrapper.h index b447d731..9be4157a 100644 --- a/ability_base/interfaces/inner_api/base/include/bool_wrapper.h +++ b/ability_base/interfaces/inner_api/base/include/bool_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/byte_wrapper.h b/ability_base/interfaces/inner_api/base/include/byte_wrapper.h index bb8d8050..a6ea099a 100644 --- a/ability_base/interfaces/inner_api/base/include/byte_wrapper.h +++ b/ability_base/interfaces/inner_api/base/include/byte_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/double_wrapper.h b/ability_base/interfaces/inner_api/base/include/double_wrapper.h index 18795e2a..463c58ad 100644 --- a/ability_base/interfaces/inner_api/base/include/double_wrapper.h +++ b/ability_base/interfaces/inner_api/base/include/double_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/float_wrapper.h b/ability_base/interfaces/inner_api/base/include/float_wrapper.h index f45d0210..0f8a68fc 100644 --- a/ability_base/interfaces/inner_api/base/include/float_wrapper.h +++ b/ability_base/interfaces/inner_api/base/include/float_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/int_wrapper.h b/ability_base/interfaces/inner_api/base/include/int_wrapper.h index e0cd21b7..5960f50d 100644 --- a/ability_base/interfaces/inner_api/base/include/int_wrapper.h +++ b/ability_base/interfaces/inner_api/base/include/int_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/ipc_singleton.h b/ability_base/interfaces/inner_api/base/include/ipc_singleton.h index 6ab3516a..37be28d5 100644 --- a/ability_base/interfaces/inner_api/base/include/ipc_singleton.h +++ b/ability_base/interfaces/inner_api/base/include/ipc_singleton.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/light_refbase.h b/ability_base/interfaces/inner_api/base/include/light_refbase.h index 3e23a9e2..5f83de5e 100644 --- a/ability_base/interfaces/inner_api/base/include/light_refbase.h +++ b/ability_base/interfaces/inner_api/base/include/light_refbase.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/long_wrapper.h b/ability_base/interfaces/inner_api/base/include/long_wrapper.h index a812ee59..edc77790 100644 --- a/ability_base/interfaces/inner_api/base/include/long_wrapper.h +++ b/ability_base/interfaces/inner_api/base/include/long_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/short_wrapper.h b/ability_base/interfaces/inner_api/base/include/short_wrapper.h index e2121f1d..96e259e0 100644 --- a/ability_base/interfaces/inner_api/base/include/short_wrapper.h +++ b/ability_base/interfaces/inner_api/base/include/short_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/string_wrapper.h b/ability_base/interfaces/inner_api/base/include/string_wrapper.h index 7452a696..260e1ba2 100644 --- a/ability_base/interfaces/inner_api/base/include/string_wrapper.h +++ b/ability_base/interfaces/inner_api/base/include/string_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/user_object_wrapper.h b/ability_base/interfaces/inner_api/base/include/user_object_wrapper.h index a42ca319..bab97191 100644 --- a/ability_base/interfaces/inner_api/base/include/user_object_wrapper.h +++ b/ability_base/interfaces/inner_api/base/include/user_object_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/base/include/zchar_wrapper.h b/ability_base/interfaces/inner_api/base/include/zchar_wrapper.h index 327d4d8d..87f24584 100644 --- a/ability_base/interfaces/inner_api/base/include/zchar_wrapper.h +++ b/ability_base/interfaces/inner_api/base/include/zchar_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/want/include/array_wrapper.h b/ability_base/interfaces/inner_api/want/include/array_wrapper.h index 8ddc0372..c05fc362 100644 --- a/ability_base/interfaces/inner_api/want/include/array_wrapper.h +++ b/ability_base/interfaces/inner_api/want/include/array_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/want/include/element_name.h b/ability_base/interfaces/inner_api/want/include/element_name.h index 2304c513..0c1912c6 100644 --- a/ability_base/interfaces/inner_api/want/include/element_name.h +++ b/ability_base/interfaces/inner_api/want/include/element_name.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/want/include/extra_params.h b/ability_base/interfaces/inner_api/want/include/extra_params.h index b87bf929..964231d1 100644 --- a/ability_base/interfaces/inner_api/want/include/extra_params.h +++ b/ability_base/interfaces/inner_api/want/include/extra_params.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/want/include/match_type.h b/ability_base/interfaces/inner_api/want/include/match_type.h index cec0f641..1a2fcde3 100644 --- a/ability_base/interfaces/inner_api/want/include/match_type.h +++ b/ability_base/interfaces/inner_api/want/include/match_type.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/want/include/operation.h b/ability_base/interfaces/inner_api/want/include/operation.h index e64544d4..9c1fb7c3 100644 --- a/ability_base/interfaces/inner_api/want/include/operation.h +++ b/ability_base/interfaces/inner_api/want/include/operation.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/want/include/operation_builder.h b/ability_base/interfaces/inner_api/want/include/operation_builder.h index cb887da7..d501ad29 100644 --- a/ability_base/interfaces/inner_api/want/include/operation_builder.h +++ b/ability_base/interfaces/inner_api/want/include/operation_builder.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/want/include/pac_map.h b/ability_base/interfaces/inner_api/want/include/pac_map.h index c8fca9ac..5613cfe9 100644 --- a/ability_base/interfaces/inner_api/want/include/pac_map.h +++ b/ability_base/interfaces/inner_api/want/include/pac_map.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/want/include/patterns_matcher.h b/ability_base/interfaces/inner_api/want/include/patterns_matcher.h index 49c021a1..06df7d3a 100644 --- a/ability_base/interfaces/inner_api/want/include/patterns_matcher.h +++ b/ability_base/interfaces/inner_api/want/include/patterns_matcher.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/want/include/skills.h b/ability_base/interfaces/inner_api/want/include/skills.h index 35e7d1fb..f3617d30 100644 --- a/ability_base/interfaces/inner_api/want/include/skills.h +++ b/ability_base/interfaces/inner_api/want/include/skills.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/want/include/want_params.h b/ability_base/interfaces/inner_api/want/include/want_params.h index 12024b9d..9334cdbf 100644 --- a/ability_base/interfaces/inner_api/want/include/want_params.h +++ b/ability_base/interfaces/inner_api/want/include/want_params.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/interfaces/inner_api/want/include/want_params_wrapper.h b/ability_base/interfaces/inner_api/want/include/want_params_wrapper.h index b5926e9e..d097d6c4 100644 --- a/ability_base/interfaces/inner_api/want/include/want_params_wrapper.h +++ b/ability_base/interfaces/inner_api/want/include/want_params_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/test/BUILD.gn b/ability_base/test/BUILD.gn index fd047472..1f358030 100644 --- a/ability_base/test/BUILD.gn +++ b/ability_base/test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. +# Copyright (c) 2021-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 @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/ability_base/ability_base.gni") base_output_path = "aafwk/base_test" @@ -44,8 +44,8 @@ config("want_private_config") { include_dirs = [ "//utils/native/base/include", "//sdk/appexecfwk/appexecfwk_base/include", - "${base_inner_api_path}/uri/include", - "${base_inner_api_path}/want/include", + "${ability_base_innerapi_path}/uri/include", + "${ability_base_innerapi_path}/want/include", ] defines = [ @@ -59,7 +59,7 @@ config("module_private_want_param_wrapper_config") { include_dirs = [ "//utils/native/base/include", "//sdk/appexecfwk/appexecfwk_base/include", - "${base_inner_api_path}/want/include", + "${ability_base_innerapi_path}/want/include", ] defines = [ @@ -74,7 +74,7 @@ ohos_unittest("operation_test") { configs = [ ":want_private_config", - "${base_path}:want_public_config", + "${ability_base_path}:want_public_config", ] deps = [ @@ -96,11 +96,11 @@ ohos_unittest("patterns_matcher_test") { configs = [ ":want_private_config", - "${base_path}:want_public_config", + "${ability_base_path}:want_public_config", ] deps = [ - "${base_path}:base", + "${ability_base_path}:base", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -118,7 +118,7 @@ ohos_unittest("skills_test") { configs = [ ":want_private_config", - "${base_path}:want_public_config", + "${ability_base_path}:want_public_config", ] deps = [ @@ -141,12 +141,12 @@ ohos_unittest("want_params_test") { configs = [ ":want_private_config", - "${base_path}:want_public_config", + "${ability_base_path}:want_public_config", ] deps = [ - "${base_path}:base", - "${base_path}:want", + "${ability_base_path}:base", + "${ability_base_path}:want", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -185,7 +185,7 @@ ohos_unittest("want_test") { configs = [ ":want_private_config", - "${base_path}:want_public_config", + "${ability_base_path}:want_public_config", ] deps = [ diff --git a/ability_base/test/unittest/base/base_test.cpp b/ability_base/test/unittest/base/base_test.cpp index fca856e6..1aef5f41 100644 --- a/ability_base/test/unittest/base/base_test.cpp +++ b/ability_base/test/unittest/base/base_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/test/unittest/want/operation_test.cpp b/ability_base/test/unittest/want/operation_test.cpp index bc5e9bdd..eb2d9e7e 100644 --- a/ability_base/test/unittest/want/operation_test.cpp +++ b/ability_base/test/unittest/want/operation_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/test/unittest/want/patterns_matcher_test.cpp b/ability_base/test/unittest/want/patterns_matcher_test.cpp index 84631df1..e45b91ba 100644 --- a/ability_base/test/unittest/want/patterns_matcher_test.cpp +++ b/ability_base/test/unittest/want/patterns_matcher_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/test/unittest/want/skills_test.cpp b/ability_base/test/unittest/want/skills_test.cpp index ca2cbf07..1cbca824 100644 --- a/ability_base/test/unittest/want/skills_test.cpp +++ b/ability_base/test/unittest/want/skills_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/test/unittest/want/want_params_test.cpp b/ability_base/test/unittest/want/want_params_test.cpp index 66ebea8e..3276385c 100644 --- a/ability_base/test/unittest/want/want_params_test.cpp +++ b/ability_base/test/unittest/want/want_params_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/ability_base/test/unittest/want/want_params_wrapper_test.cpp b/ability_base/test/unittest/want/want_params_wrapper_test.cpp index f9d7a424..0754b1b7 100644 --- a/ability_base/test/unittest/want/want_params_wrapper_test.cpp +++ b/ability_base/test/unittest/want/want_params_wrapper_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/BUILD.gn b/form_runtime/BUILD.gn index 928cae14..a86164a2 100644 --- a/form_runtime/BUILD.gn +++ b/form_runtime/BUILD.gn @@ -13,6 +13,7 @@ import("//build/ohos.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/form_runtime/form_runtime.gni") ################################### libfms ######################################## config("formmgr_config") { @@ -25,9 +26,8 @@ config("formmgr_config") { ohos_shared_library("libfms") { cflags_cc = [] include_dirs = [ - "${services_path}/common:perm_verification", - "${aafwk_path}/services/common/include", - "${kits_path}/appkit/native/ability_runtime", + "${ability_runtime_path}/services/common/include", + "${ability_runtime_kits_path}/appkit/native/ability_runtime", ] sources = [ "services/src/form_ability_connection.cpp", @@ -79,8 +79,8 @@ ohos_shared_library("libfms") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${kits_path}/appkit:app_context", - "${services_path}/common:perm_verification", + "${ability_runtime_kits_path}/appkit:app_context", + "${ability_runtime_services_path}/common:perm_verification", ] external_deps = [ @@ -130,10 +130,10 @@ config("fmskit_config") { config("fmskit_public_config") { include_dirs = [ "interfaces/kits/native/include", - "${aafwk_path}/services/common/include", + "${ability_runtime_path}/services/common/include", "${form_runtime_path}/interfaces/inner_api/include", - "${appexecfwk_inner_api_path}/appexecfwk_base/include", - "${base_inner_api_path}/want/include", + "${bundlefwk_inner_api_path}/appexecfwk_base/include", + "${ability_base_innerapi_path}/want/include", ] } @@ -175,10 +175,10 @@ config("formmgr_sdk_config") { include_dirs = [ "interfaces/inner_api/include/", "//third_party/json/include", - "${kits_path}/ability/native/include", - "${innerkits_path}/ability_manager/include", - "${innerkits_path}/app_manager/include/appmgr", - "${aafwk_path}/services/common/include", + "${ability_runtime_kits_path}/ability/native/include", + "${ability_runtime_innerapi_path}/ability_manager/include", + "${ability_runtime_innerapi_path}/app_manager/include/appmgr", + "${ability_runtime_path}/services/common/include", ] cflags = [] if (target_cpu == "arm") { diff --git a/form_runtime/form_runtime.gni b/form_runtime/form_runtime.gni new file mode 100755 index 00000000..0cb0a2a0 --- /dev/null +++ b/form_runtime/form_runtime.gni @@ -0,0 +1,27 @@ +# 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. + +ability_base_path = "//foundation/aafwk/standard/ability_base" +ability_base_innerapi_path = "${ability_base_path}/interfaces/inner_api" +ability_runtime_path = "//foundation/aafwk/standard" +ability_runtime_innerapi_path = "${ability_runtime_path}/interfaces/innerkits" +ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits" +ability_runtime_services_path = "${ability_runtime_path}/services" +bundlefwk_path = "//foundation/bundlemanager/bundle_framework" +bundlefwk_innerkits_path = "${bundlefwk_path}/interfaces/innerkits" +bundlefwk_inner_api_path = "${bundlefwk_path}/interfaces/inner_api" +distributeddatamgr_path = "//foundation/distributeddatamgr" +distributedschedule_path = "//foundation/distributedschedule" +form_runtime_path = "//foundation/aafwk/standard/form_runtime" +form_runtime_napi_path = "${form_runtime_path}/frameworks/js/napi" +global_path = "//base/global" diff --git a/form_runtime/frameworks/js/napi/BUILD.gn b/form_runtime/frameworks/js/napi/BUILD.gn index 19fc5779..1e613f74 100644 --- a/form_runtime/frameworks/js/napi/BUILD.gn +++ b/form_runtime/frameworks/js/napi/BUILD.gn @@ -13,7 +13,7 @@ import("//ark/ts2abc/ts2panda/ts2abc_config.gni") import("//build/ohos.gni") -import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/form_runtime/form_runtime.gni") ################################### formbindingdata_napi ######################################## ohos_shared_library("formbindingdata_napi") { @@ -24,7 +24,7 @@ ohos_shared_library("formbindingdata_napi") { "form_binding_data/form_binding_data_module.cpp", ] - configs = [ "${services_path}/common:common_config" ] + configs = [] deps = [] @@ -125,7 +125,7 @@ ohos_shared_library("forminfo_napi") { "form_info/js_form_info.cpp", ] - configs = [ "${services_path}/common:common_config" ] + configs = [] deps = [] @@ -157,9 +157,9 @@ ohos_shared_library("formhost_napi") { deps = [ ":formutil_napi", - "${aafwk_path}/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", + "${ability_runtime_kits_path}/appkit:appkit_native", + "${ability_runtime_path}/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", "${form_runtime_path}:fmskit_native", - "${kits_path}/appkit:appkit_native", ] external_deps = [ @@ -190,8 +190,8 @@ ohos_shared_library("formmanager") { ] deps = [ - "${aafwk_path}/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", - "${kits_path}/appkit:appkit_native", + "${ability_runtime_kits_path}/appkit:appkit_native", + "${ability_runtime_path}/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", ] external_deps = [ @@ -224,7 +224,7 @@ ohos_shared_library("formprovider_napi") { deps = [ ":formutil_napi", - "${kits_path}/appkit:appkit_native", + "${ability_runtime_kits_path}/appkit:appkit_native", ] external_deps = [ @@ -257,7 +257,7 @@ ohos_shared_library("formutil_napi") { sources = [ "formUtil/napi_form_util.cpp" ] - deps = [ "${aafwk_path}/frameworks/kits/appkit:appkit_native" ] + deps = [ "${ability_runtime_path}/frameworks/kits/appkit:appkit_native" ] external_deps = [ "ability_base:base", @@ -283,7 +283,7 @@ ohos_shared_library("formerror_napi") { "form_error/js_form_error.cpp", ] - configs = [ "${services_path}/common:common_config" ] + configs = [] deps = [ ":formutil_napi" ] diff --git a/form_runtime/frameworks/js/napi/formHost/napi_form_host.h b/form_runtime/frameworks/js/napi/formHost/napi_form_host.h index 50b585b0..9e2ae950 100644 --- a/form_runtime/frameworks/js/napi/formHost/napi_form_host.h +++ b/form_runtime/frameworks/js/napi/formHost/napi_form_host.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/formHost/native_module.cpp b/form_runtime/frameworks/js/napi/formHost/native_module.cpp index 4c9213c4..71ea6f3e 100644 --- a/form_runtime/frameworks/js/napi/formHost/native_module.cpp +++ b/form_runtime/frameworks/js/napi/formHost/native_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/formManager/napi_form_manager.h b/form_runtime/frameworks/js/napi/formManager/napi_form_manager.h index 456f87bb..5bc38a85 100644 --- a/form_runtime/frameworks/js/napi/formManager/napi_form_manager.h +++ b/form_runtime/frameworks/js/napi/formManager/napi_form_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/formManager/native_module.cpp b/form_runtime/frameworks/js/napi/formManager/native_module.cpp index 3d9eec7b..5f1d109f 100644 --- a/form_runtime/frameworks/js/napi/formManager/native_module.cpp +++ b/form_runtime/frameworks/js/napi/formManager/native_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/formProvider/napi_form_provider.h b/form_runtime/frameworks/js/napi/formProvider/napi_form_provider.h index 7d7e1e40..07bfc055 100644 --- a/form_runtime/frameworks/js/napi/formProvider/napi_form_provider.h +++ b/form_runtime/frameworks/js/napi/formProvider/napi_form_provider.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/formProvider/native_module.cpp b/form_runtime/frameworks/js/napi/formProvider/native_module.cpp index 83953fd9..c66d12e6 100644 --- a/form_runtime/frameworks/js/napi/formProvider/native_module.cpp +++ b/form_runtime/frameworks/js/napi/formProvider/native_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/formUtil/napi_form_util.h b/form_runtime/frameworks/js/napi/formUtil/napi_form_util.h index eb0c3da2..5ea90f9a 100644 --- a/form_runtime/frameworks/js/napi/formUtil/napi_form_util.h +++ b/form_runtime/frameworks/js/napi/formUtil/napi_form_util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.cpp b/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.cpp index d48213f0..f12c730a 100644 --- a/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.cpp +++ b/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.h b/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.h index 48319d04..1cb52716 100644 --- a/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.h +++ b/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.js b/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.js index b372d107..337dd389 100644 --- a/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.js +++ b/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data_module.cpp b/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data_module.cpp index c114d319..20b33bbd 100644 --- a/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data_module.cpp +++ b/form_runtime/frameworks/js/napi/form_binding_data/form_binding_data_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/form_extension/form_extension.js b/form_runtime/frameworks/js/napi/form_extension/form_extension.js index cf10f2ba..6de862ef 100644 --- a/form_runtime/frameworks/js/napi/form_extension/form_extension.js +++ b/form_runtime/frameworks/js/napi/form_extension/form_extension.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/form_extension/form_extension_module.cpp b/form_runtime/frameworks/js/napi/form_extension/form_extension_module.cpp index ce20b7da..0a9122ad 100644 --- a/form_runtime/frameworks/js/napi/form_extension/form_extension_module.cpp +++ b/form_runtime/frameworks/js/napi/form_extension/form_extension_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/form_extension_context/form_extension_context.js b/form_runtime/frameworks/js/napi/form_extension_context/form_extension_context.js index ae2371f6..91b097b7 100644 --- a/form_runtime/frameworks/js/napi/form_extension_context/form_extension_context.js +++ b/form_runtime/frameworks/js/napi/form_extension_context/form_extension_context.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/form_extension_context/form_extension_context_module.cpp b/form_runtime/frameworks/js/napi/form_extension_context/form_extension_context_module.cpp index 44cbf45f..545f5e2c 100644 --- a/form_runtime/frameworks/js/napi/form_extension_context/form_extension_context_module.cpp +++ b/form_runtime/frameworks/js/napi/form_extension_context/form_extension_context_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/form_info/form_info_module.cpp b/form_runtime/frameworks/js/napi/form_info/form_info_module.cpp index dc6ace75..8a0d133d 100644 --- a/form_runtime/frameworks/js/napi/form_info/form_info_module.cpp +++ b/form_runtime/frameworks/js/napi/form_info/form_info_module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/form_info/js_form_info.cpp b/form_runtime/frameworks/js/napi/form_info/js_form_info.cpp index 0be7412f..baf0fc22 100644 --- a/form_runtime/frameworks/js/napi/form_info/js_form_info.cpp +++ b/form_runtime/frameworks/js/napi/form_info/js_form_info.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/frameworks/js/napi/form_info/js_form_info.h b/form_runtime/frameworks/js/napi/form_info/js_form_info.h index df3acce1..14ba56bc 100644 --- a/form_runtime/frameworks/js/napi/form_info/js_form_info.h +++ b/form_runtime/frameworks/js/napi/form_info/js_form_info.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_death_callback.h b/form_runtime/interfaces/inner_api/include/form_death_callback.h index 795d7f8f..c4f151b0 100644 --- a/form_runtime/interfaces/inner_api/include/form_death_callback.h +++ b/form_runtime/interfaces/inner_api/include/form_death_callback.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_host_interface.h b/form_runtime/interfaces/inner_api/include/form_host_interface.h index c77ed799..4089642b 100644 --- a/form_runtime/interfaces/inner_api/include/form_host_interface.h +++ b/form_runtime/interfaces/inner_api/include/form_host_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_host_stub.h b/form_runtime/interfaces/inner_api/include/form_host_stub.h index 256c9cb8..42d75b6a 100644 --- a/form_runtime/interfaces/inner_api/include/form_host_stub.h +++ b/form_runtime/interfaces/inner_api/include/form_host_stub.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_js_info.h b/form_runtime/interfaces/inner_api/include/form_js_info.h index 016edcc9..bc945048 100644 --- a/form_runtime/interfaces/inner_api/include/form_js_info.h +++ b/form_runtime/interfaces/inner_api/include/form_js_info.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_mgr_interface.h b/form_runtime/interfaces/inner_api/include/form_mgr_interface.h index 5ab50626..9d838d3f 100644 --- a/form_runtime/interfaces/inner_api/include/form_mgr_interface.h +++ b/form_runtime/interfaces/inner_api/include/form_mgr_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_mgr_proxy.h b/form_runtime/interfaces/inner_api/include/form_mgr_proxy.h index bec19e6f..a96f6a3c 100644 --- a/form_runtime/interfaces/inner_api/include/form_mgr_proxy.h +++ b/form_runtime/interfaces/inner_api/include/form_mgr_proxy.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_mgr_stub.h b/form_runtime/interfaces/inner_api/include/form_mgr_stub.h index a00f153a..57e9ac4e 100644 --- a/form_runtime/interfaces/inner_api/include/form_mgr_stub.h +++ b/form_runtime/interfaces/inner_api/include/form_mgr_stub.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_provider_data.h b/form_runtime/interfaces/inner_api/include/form_provider_data.h index 042adfee..d8ad7626 100644 --- a/form_runtime/interfaces/inner_api/include/form_provider_data.h +++ b/form_runtime/interfaces/inner_api/include/form_provider_data.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_provider_info.h b/form_runtime/interfaces/inner_api/include/form_provider_info.h index 001040ee..d78a0fe4 100644 --- a/form_runtime/interfaces/inner_api/include/form_provider_info.h +++ b/form_runtime/interfaces/inner_api/include/form_provider_info.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_provider_interface.h b/form_runtime/interfaces/inner_api/include/form_provider_interface.h index a5d58757..4834e0da 100644 --- a/form_runtime/interfaces/inner_api/include/form_provider_interface.h +++ b/form_runtime/interfaces/inner_api/include/form_provider_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_provider_stub.h b/form_runtime/interfaces/inner_api/include/form_provider_stub.h index 4eaabfea..695c96a9 100644 --- a/form_runtime/interfaces/inner_api/include/form_provider_stub.h +++ b/form_runtime/interfaces/inner_api/include/form_provider_stub.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_supply_interface.h b/form_runtime/interfaces/inner_api/include/form_supply_interface.h index 69357259..d821aed3 100644 --- a/form_runtime/interfaces/inner_api/include/form_supply_interface.h +++ b/form_runtime/interfaces/inner_api/include/form_supply_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/form_supply_stub.h b/form_runtime/interfaces/inner_api/include/form_supply_stub.h index bf1352c7..4923dfda 100644 --- a/form_runtime/interfaces/inner_api/include/form_supply_stub.h +++ b/form_runtime/interfaces/inner_api/include/form_supply_stub.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/provider_connect_proxy.h b/form_runtime/interfaces/inner_api/include/provider_connect_proxy.h index 194c8804..9b9ec513 100644 --- a/form_runtime/interfaces/inner_api/include/provider_connect_proxy.h +++ b/form_runtime/interfaces/inner_api/include/provider_connect_proxy.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/include/provider_connect_stub.h b/form_runtime/interfaces/inner_api/include/provider_connect_stub.h index c8f52b8e..f56945e3 100644 --- a/form_runtime/interfaces/inner_api/include/provider_connect_stub.h +++ b/form_runtime/interfaces/inner_api/include/provider_connect_stub.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/inner_api/src/form_provider_info.cpp b/form_runtime/interfaces/inner_api/src/form_provider_info.cpp index f42c3058..749bfcc7 100644 --- a/form_runtime/interfaces/inner_api/src/form_provider_info.cpp +++ b/form_runtime/interfaces/inner_api/src/form_provider_info.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/kits/native/include/form_callback_interface.h b/form_runtime/interfaces/kits/native/include/form_callback_interface.h index 48afbb63..b92f0555 100644 --- a/form_runtime/interfaces/kits/native/include/form_callback_interface.h +++ b/form_runtime/interfaces/kits/native/include/form_callback_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/kits/native/include/form_errors.h b/form_runtime/interfaces/kits/native/include/form_errors.h index c562e89d..39f90991 100644 --- a/form_runtime/interfaces/kits/native/include/form_errors.h +++ b/form_runtime/interfaces/kits/native/include/form_errors.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/kits/native/include/form_host_client.h b/form_runtime/interfaces/kits/native/include/form_host_client.h index 33803b85..33922b73 100644 --- a/form_runtime/interfaces/kits/native/include/form_host_client.h +++ b/form_runtime/interfaces/kits/native/include/form_host_client.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/kits/native/include/form_mgr.h b/form_runtime/interfaces/kits/native/include/form_mgr.h index e62a8760..7df66884 100644 --- a/form_runtime/interfaces/kits/native/include/form_mgr.h +++ b/form_runtime/interfaces/kits/native/include/form_mgr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/kits/native/src/form_errors.cpp b/form_runtime/interfaces/kits/native/src/form_errors.cpp index b1840d9e..b926e71d 100644 --- a/form_runtime/interfaces/kits/native/src/form_errors.cpp +++ b/form_runtime/interfaces/kits/native/src/form_errors.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/kits/native/src/form_host_client.cpp b/form_runtime/interfaces/kits/native/src/form_host_client.cpp index 8780d1cc..08f9933c 100644 --- a/form_runtime/interfaces/kits/native/src/form_host_client.cpp +++ b/form_runtime/interfaces/kits/native/src/form_host_client.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/interfaces/kits/native/src/form_mgr.cpp b/form_runtime/interfaces/kits/native/src/form_mgr.cpp index 564a94c0..6b631189 100644 --- a/form_runtime/interfaces/kits/native/src/form_mgr.cpp +++ b/form_runtime/interfaces/kits/native/src/form_mgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-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 diff --git a/form_runtime/sa_profile/403.xml b/form_runtime/sa_profile/403.xml index 7176a66d..79b5938c 100644 --- a/form_runtime/sa_profile/403.xml +++ b/form_runtime/sa_profile/403.xml @@ -1,6 +1,6 @@