IssueNo:#I56EGM

Description:form_runtime部件目录整改
Sig:SIG_ApplicationFramework
Feature or Bugfix:Feature
Binary Source: No

Signed-off-by: dy_study <dingyao5@huawei.com>
Change-Id: Idda63b32288c0f6301f7326e71148b5242196d44
This commit is contained in:
dy_study 2022-05-09 09:29:21 +08:00
parent 8a3849b2fd
commit d041c00de5
216 changed files with 764 additions and 889 deletions

View File

@ -28,6 +28,8 @@ appexecfwk_innerkits_path = "${appexecfwk_path}/interfaces/innerkits"
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"
declare_args() {
background_task_mgr_continuous_task_enable = true

266
form_runtime/BUILD.gn Normal file
View File

@ -0,0 +1,266 @@
# 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
#
# 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.
import("//build/ohos.gni")
import("//foundation/aafwk/standard/aafwk.gni")
################################### libfms ########################################
config("formmgr_config") {
include_dirs = [
"services/include",
"//third_party/json/include",
]
}
ohos_shared_library("libfms") {
cflags_cc = []
include_dirs = [
"${services_path}/common:perm_verification",
"${aafwk_path}/services/common/include",
"${appexecfwk_path}/common/log/include",
"${kits_path}/appkit/native/ability_runtime",
]
sources = [
"services/src/form_ability_connection.cpp",
"services/src/form_acquire_connection.cpp",
"services/src/form_acquire_state_connection.cpp",
"services/src/form_ams_helper.cpp",
"services/src/form_batch_delete_connection.cpp",
"services/src/form_bms_helper.cpp",
"services/src/form_cache_mgr.cpp",
"services/src/form_cast_temp_connection.cpp",
"services/src/form_data_mgr.cpp",
"services/src/form_db_cache.cpp",
"services/src/form_db_info.cpp",
"services/src/form_delete_connection.cpp",
"services/src/form_dump_mgr.cpp",
"services/src/form_event_notify_connection.cpp",
"services/src/form_host_callback.cpp",
"services/src/form_host_record.cpp",
"services/src/form_info_mgr.cpp",
"services/src/form_info_storage.cpp",
"services/src/form_info_storage_mgr.cpp",
"services/src/form_item_info.cpp",
"services/src/form_mgr_adapter.cpp",
"services/src/form_mgr_service.cpp",
"services/src/form_msg_event_connection.cpp",
"services/src/form_provider_mgr.cpp",
"services/src/form_refresh_connection.cpp",
"services/src/form_refresh_limiter.cpp",
"services/src/form_storage_mgr.cpp",
"services/src/form_supply_callback.cpp",
"services/src/form_sys_event_receiver.cpp",
"services/src/form_task_mgr.cpp",
"services/src/form_timer_mgr.cpp",
"services/src/form_util.cpp",
"services/src/kvstore_death_recipient_callback.cpp",
]
defines = [
"AMS_LOG_TAG = \"FormMgrService\"",
"AMS_LOG_DOMAIN = 0xD001120",
]
configs = [
":formmgr_config",
":formmgr_sdk_config",
]
cflags = []
if (target_cpu == "arm") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"${kits_path}/appkit:app_context",
"${services_path}/common:perm_verification",
]
external_deps = [
"ability_base:base",
"ability_base:want",
"ability_base:zuri",
"ability_runtime:ability_manager",
"ability_runtime:app_manager",
"ability_runtime:wantagent_innerkits",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"common_event_service:cesfwk_core",
"common_event_service:cesfwk_innerkits",
"device_usage_statistics:usagestatsinner",
"distributeddatamgr:distributeddata_inner",
"eventhandler:libeventhandler",
"form_runtime:form_manager",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"power_manager_native:powermgr_client",
"safwk:system_ability_fwk",
"samgr_standard:samgr_proxy",
"time_native:time_service",
"utils_base:utils",
]
if (os_account_part_enabled) {
cflags_cc += [ "-DOS_ACCOUNT_PART_ENABLED" ]
external_deps += [
"os_account:libaccountkits",
"os_account:os_account_innerkits",
]
}
subsystem_name = "aafwk"
part_name = "form_runtime"
}
################################### fmskit_native ########################################
config("fmskit_config") {
defines = [
"AMS_LOG_TAG = \"FmskitNative\"",
"AMS_LOG_DOMAIN = 0xD001151",
]
}
config("fmskit_public_config") {
include_dirs = [
"interfaces/kits/native/include",
"${aafwk_path}/services/common/include",
"${form_runtime_path}/interfaces/inner_api/include",
"${appexecfwk_innerkits_path}/appexecfwk_base/include",
"${innerkits_path}/want/include",
]
}
ohos_shared_library("fmskit_native") {
configs = [ ":fmskit_config" ]
public_configs = [ ":fmskit_public_config" ]
sources = [
"interfaces/kits/native/src/form_errors.cpp",
"interfaces/kits/native/src/form_host_client.cpp",
"interfaces/kits/native/src/form_mgr.cpp",
]
cflags = []
if (target_cpu == "arm") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = []
external_deps = [
"ability_base:want",
"ability_runtime:app_manager",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"form_runtime:form_manager",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
subsystem_name = "aafwk"
part_name = "form_runtime"
}
################################### form_manager ########################################
config("formmgr_sdk_config") {
visibility = [ ":*" ]
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",
]
cflags = []
if (target_cpu == "arm") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
}
ohos_shared_library("form_manager") {
sources = [
"interfaces/inner_api/src/form_host_proxy.cpp",
"interfaces/inner_api/src/form_host_stub.cpp",
"interfaces/inner_api/src/form_js_info.cpp",
"interfaces/inner_api/src/form_mgr_proxy.cpp",
"interfaces/inner_api/src/form_mgr_stub.cpp",
"interfaces/inner_api/src/form_provider_data.cpp",
"interfaces/inner_api/src/form_provider_info.cpp",
"interfaces/inner_api/src/form_provider_proxy.cpp",
"interfaces/inner_api/src/form_provider_stub.cpp",
"interfaces/inner_api/src/form_supply_proxy.cpp",
"interfaces/inner_api/src/form_supply_stub.cpp",
"interfaces/inner_api/src/provider_connect_proxy.cpp",
"interfaces/inner_api/src/provider_connect_stub.cpp",
]
defines = [
"AMS_LOG_TAG = \"FormMgrService\"",
"AMS_LOG_DOMAIN = 0xD001120",
]
public_configs = [
":formmgr_sdk_config",
"${form_runtime_path}:formmgr_config",
]
deps = [ "//third_party/jsoncpp:jsoncpp" ]
external_deps = [
"ability_base:want",
"ability_runtime:app_manager",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"native_appdatamgr:native_appdatafwk",
"native_appdatamgr:native_dataability",
"native_appdatamgr:native_rdb",
"utils_base:utils",
]
subsystem_name = "aafwk"
part_name = "form_runtime"
}
group("form_napi_packages") {
if (ability_runtime_graphics) {
deps = [
"${form_runtime_napi_path}:formbindingdata_napi",
"${form_runtime_napi_path}:formerror_napi",
"${form_runtime_napi_path}:formextension_napi",
"${form_runtime_napi_path}:formextensioncontext_napi",
"${form_runtime_napi_path}:formhost_napi",
"${form_runtime_napi_path}:forminfo_napi",
"${form_runtime_napi_path}:formmanager",
"${form_runtime_napi_path}:formprovider_napi",
"${form_runtime_napi_path}:formutil_napi",
]
}
}
group("fms_innerkits_target") {
if (ability_runtime_graphics) {
deps = [ ":form_manager" ]
}
}
group("fms_target") {
deps = [ ":libfms" ]
}
group("fms_services_target") {
if (ability_runtime_graphics) {
deps = [ ":fms_target" ]
}
}

View File

@ -5,7 +5,7 @@
"license": "Apache License 2.0",
"publishAs": "code-segment",
"segment": {
"destPath": "foundation/aafwk/standard/services/formmgr"
"destPath": "foundation/aafwk/standard/form_runtime"
},
"dirs": {},
"scripts": {},
@ -44,16 +44,16 @@
},
"build": {
"sub_component": [
"//foundation/aafwk/standard/sa_profile:form_sa_profile",
"//foundation/aafwk/standard/services:fms_services_target",
"//foundation/aafwk/standard/interfaces/innerkits:fms_innerkits_target",
"//foundation/aafwk/standard/frameworks/kits/fmskit:fmskit_native",
"//foundation/aafwk/standard/interfaces/kits/napi:form_napi_packages"
"//foundation/aafwk/standard/form_runtime/sa_profile:form_sa_profile",
"//foundation/aafwk/standard/form_runtime:fms_services_target",
"//foundation/aafwk/standard/form_runtime:fms_innerkits_target",
"//foundation/aafwk/standard/form_runtime:fmskit_native",
"//foundation/aafwk/standard/form_runtime:form_napi_packages"
],
"inner_kits": [
{
"header": {
"header_base": "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include",
"header_base": "//foundation/aafwk/standard/form_runtime/interfaces/inner_api/include",
"header_files": [
"form_death_callback.h",
"form_host_interface.h",
@ -71,22 +71,22 @@
"form_js_info.h"
]
},
"name": "//foundation/aafwk/standard/interfaces/innerkits/form_manager:form_manager"
"name": "//foundation/aafwk/standard/form_runtime:form_manager"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include",
"header_base": "//foundation/aafwk/standard/form_runtime/interfaces/kits/native/include",
"header_files": [
"form_callback_interface.h",
"form_host_client.h",
"form_mgr.h"
]
},
"name": "//foundation/aafwk/standard/frameworks/kits/fmskit:fmskit_native"
"name": "//foundation/aafwk/standard/form_runtime:fmskit_native"
}
],
"test": [
"//foundation/aafwk/standard/services/formmgr/test:unittest"
"//foundation/aafwk/standard/form_runtime/test:unittest"
]
}
}

View File

@ -0,0 +1,302 @@
# 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
#
# 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.
import("//ark/ts2abc/ts2panda/ts2abc_config.gni")
import("//build/ohos.gni")
import("//foundation/aafwk/standard/aafwk.gni")
################################### formbindingdata_napi ########################################
ohos_shared_library("formbindingdata_napi") {
include_dirs = []
sources = [
"form_binding_data/form_binding_data.cpp",
"form_binding_data/form_binding_data_module.cpp",
]
configs = [ "${services_path}/common:common_config" ]
deps = []
external_deps = [
"ability_runtime:runtime",
"bundle_framework:appexecfwk_base",
"form_runtime:form_manager",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
"utils_base:utils",
]
relative_install_dir = "module/application"
subsystem_name = "aafwk"
part_name = "form_runtime"
}
################################### gen_form_extension_abc ########################################
ts2abc_gen_abc("gen_form_extension_abc") {
src_js = rebase_path("form_extension/form_extension.js")
dst_file = rebase_path(target_out_dir + "/form_extension.abc")
in_puts = [ "form_extension/form_extension.js" ]
out_puts = [ target_out_dir + "/form_extension.abc" ]
extra_args = [ "--module" ]
}
gen_js_obj("form_extension_js") {
input = "form_extension/form_extension.js"
output = target_out_dir + "/form_extension.o"
}
gen_js_obj("form_extension_abc") {
input = get_label_info(":gen_form_extension_abc", "target_out_dir") +
"/form_extension.abc"
output = target_out_dir + "/form_extension_abc.o"
dep = ":gen_form_extension_abc"
}
ohos_shared_library("formextension_napi") {
sources = [ "form_extension/form_extension_module.cpp" ]
deps = [
":form_extension_abc",
":form_extension_js",
]
external_deps = [ "napi:ace_napi" ]
relative_install_dir = "module/application"
subsystem_name = "aafwk"
part_name = "form_runtime"
}
################################### gen_form_extension_context_abc ########################################
ts2abc_gen_abc("gen_form_extension_context_abc") {
src_js = rebase_path("form_extension_context/form_extension_context.js")
dst_file = rebase_path(target_out_dir + "/form_extension_context.abc")
in_puts = [ "form_extension_context/form_extension_context.js" ]
out_puts = [ target_out_dir + "/form_extension_context.abc" ]
extra_args = [ "--module" ]
}
gen_js_obj("form_extension_context_js") {
input = "form_extension_context/form_extension_context.js"
output = target_out_dir + "/form_extension_context.o"
}
gen_js_obj("form_extension_context_abc") {
input = get_label_info(":gen_form_extension_context_abc", "target_out_dir") +
"/form_extension_context.abc"
output = target_out_dir + "/form_extension_context_abc.o"
dep = ":gen_form_extension_context_abc"
}
ohos_shared_library("formextensioncontext_napi") {
sources = [ "form_extension_context/form_extension_context_module.cpp" ]
deps = [
":form_extension_context_abc",
":form_extension_context_js",
]
external_deps = [ "napi:ace_napi" ]
relative_install_dir = "module/application"
subsystem_name = "aafwk"
part_name = "form_runtime"
}
################################### forminfo_napi ########################################
ohos_shared_library("forminfo_napi") {
include_dirs = []
sources = [
"form_info/form_info_module.cpp",
"form_info/js_form_info.cpp",
]
configs = [ "${services_path}/common:common_config" ]
deps = []
external_deps = [
"ability_base:want",
"ability_runtime:runtime",
"bundle_framework:appexecfwk_base",
"form_runtime:form_manager",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
"utils_base:utils",
]
relative_install_dir = "module/application"
subsystem_name = "aafwk"
part_name = "form_runtime"
}
################################### formhost_napi ########################################
ohos_shared_library("formhost_napi") {
include_dirs = []
sources = [
"formHost/napi_form_host.cpp",
"formHost/native_module.cpp",
]
deps = [
":formutil_napi",
"${aafwk_path}/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
"${form_runtime_path}:fmskit_native",
"${kits_path}/appkit:appkit_native",
]
external_deps = [
"ability_base:base",
"ability_base:want",
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:runtime",
"bundle_framework:appexecfwk_base",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
]
relative_install_dir = "module/application"
subsystem_name = "aafwk"
part_name = "form_runtime"
}
################################### formmanager ########################################
ohos_shared_library("formmanager") {
include_dirs = []
sources = [
"formManager/napi_form_manager.cpp",
"formManager/native_module.cpp",
]
deps = [
"${aafwk_path}/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
"${kits_path}/appkit:appkit_native",
]
external_deps = [
"ability_base:base",
"ability_base:want",
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:runtime",
"bundle_framework:appexecfwk_base",
"form_runtime:form_manager",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
]
relative_install_dir = "module/ability"
subsystem_name = "aafwk"
part_name = "form_runtime"
}
################################### formprovider_napi ########################################
ohos_shared_library("formprovider_napi") {
include_dirs = []
sources = [
"formProvider/napi_form_provider.cpp",
"formProvider/native_module.cpp",
]
deps = [
":formutil_napi",
"${kits_path}/appkit:appkit_native",
]
external_deps = [
"ability_base:base",
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:runtime",
"bundle_framework:appexecfwk_base",
"form_runtime:form_manager",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
]
relative_install_dir = "module/application"
subsystem_name = "aafwk"
part_name = "form_runtime"
}
################################### formutil_napi_public_config ########################################
config("formutil_napi_public_config") {
include_dirs = [ "formUtil/" ]
}
ohos_shared_library("formutil_napi") {
include_dirs = []
public_configs = [ ":formutil_napi_public_config" ]
sources = [ "formUtil/napi_form_util.cpp" ]
deps = [ "${aafwk_path}/frameworks/kits/appkit:appkit_native" ]
external_deps = [
"ability_base:base",
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:runtime",
"bundle_framework:appexecfwk_base",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
]
subsystem_name = "aafwk"
part_name = "form_runtime"
}
################################### formerror_napi ########################################
ohos_shared_library("formerror_napi") {
include_dirs = []
sources = [
"form_error/form_error_module.cpp",
"form_error/js_form_error.cpp",
]
configs = [ "${services_path}/common:common_config" ]
deps = [ ":formutil_napi" ]
external_deps = [
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:runtime",
"form_runtime:form_manager",
"hiviewdfx_hilog_native:libhilog",
]
relative_install_dir = "module/application"
subsystem_name = "aafwk"
part_name = "form_runtime"
}

View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
* Copyright (c) 2021 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.
-->
<info>
<process>foundation</process>
<systemability>
<name>403</name>
<libpath>/system/lib64/libfms.z.so</libpath>
<!--<depend></depend> --> <!-- Declare the name of system abilities which the system ability depends on, Note that one dependency uses 1 line. If there are dependencies, it needs to check if all those dependencies are available in service manager before starting the system ability. -->
<!--<depend-time-out></depend-time-out> --> <!-- Check all dependencies are available before the timeout period ended. The MAX_DEPENDENCY_TIMEOUT is 60s. -->
<run-on-create>true</run-on-create>
<distributed>false</distributed>
<dump-level>1</dump-level>
</systemability>
</info>

View File

@ -11,31 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/aafwk/standard/aafwk.gni")
import("//build/ohos/sa_profile/sa_profile.gni")
ohos_shared_library("formerror_napi") {
include_dirs = [ "../formUtil" ]
ohos_sa_profile("form_sa_profile") {
sources = [ "403.xml" ]
sources = [
"form_error_module.cpp",
"js_form_error.cpp",
]
configs = [ "${services_path}/common:common_config" ]
deps = []
external_deps = [
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"ability_runtime:runtime",
"form_runtime:form_manager",
"hiviewdfx_hilog_native:libhilog",
]
relative_install_dir = "module/application"
subsystem_name = "aafwk"
part_name = "form_runtime"
}

Some files were not shown because too many files have changed in this diff Show More