构建一致性问题修改

Signed-off-by: litiangang4 <litiangang4@huawei.com>
This commit is contained in:
litiangang4
2023-06-15 16:52:08 +08:00
parent ecd5567b8a
commit a7759642be
48 changed files with 14 additions and 114 deletions
+1 -1
View File
@@ -46,7 +46,7 @@
"third_party":[
"jsoncpp",
"googletest",
"libcrypto_static",
"libcrypto_shared",
"libevdev",
"openssl"
]
@@ -35,8 +35,6 @@ ohos_unittest("distributed_input_white_list_test") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"//third_party/json/include",
"${utils_path}/include",
+1 -6
View File
@@ -21,8 +21,6 @@ ohos_shared_library("libdinput_dfx_utils") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${frameworks_path}/include",
"${dfx_utils_path}/include",
"${service_common}/include",
@@ -41,10 +39,7 @@ ohos_shared_library("libdinput_dfx_utils") {
"LOG_DOMAIN=0xD004100",
]
deps = [
"${utils_path}:libdinput_utils",
"//third_party/openssl:libcrypto_static",
]
deps = [ "${utils_path}:libdinput_utils" ]
external_deps = [
"c_utils:utils",
+2 -6
View File
@@ -32,8 +32,7 @@ ohos_unittest("distributed_input_dfx_test") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${frameworks_path}/include",
"${dfx_utils_path}/include",
"${service_common}/include",
@@ -61,10 +60,7 @@ ohos_unittest("distributed_input_dfx_test") {
"LOG_DOMAIN=0xD004100",
]
deps = [
"${utils_path}:libdinput_utils",
"//third_party/openssl:libcrypto_static",
]
deps = [ "${utils_path}:libdinput_utils" ]
external_deps = [
"c_utils:utils",
-2
View File
@@ -36,8 +36,6 @@ service_common = "${distributedinput_path}/services/common"
fwk_common_path = "${distributedhardwarefwk_path}/common"
fwk_utils_path = "${distributedhardwarefwk_path}/utils"
fwk_interfaces_path = "${distributedhardwarefwk_path}/interfaces/inner_kits"
distributedinput_ldflags = [ "-lpthread" ]
+1 -3
View File
@@ -21,8 +21,6 @@ ohos_shared_library("libdinput_handler") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"${frameworks_path}/include",
"${utils_path}/include",
@@ -45,7 +43,7 @@ ohos_shared_library("libdinput_handler") {
deps = [
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
"//third_party/openssl:libcrypto_static",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
@@ -31,8 +31,6 @@ ohos_unittest("distributed_input_handler_test") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"${frameworks_path}/include",
"${utils_path}/include",
@@ -65,7 +63,7 @@ ohos_unittest("distributed_input_handler_test") {
deps = [
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
"//third_party/openssl:libcrypto_static",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
-2
View File
@@ -23,8 +23,6 @@ config("input_sdk_public_config") {
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${fwk_utils_path}/include",
"${fwk_utils_path}/include/log",
"${innerkits_path}/include",
"${innerkits_path}/src",
"${ipc_path}/include",
@@ -37,8 +37,6 @@ ohos_unittest("distributed_input_inner_test") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${utils_path}/include",
"${fwk_interfaces_path}/include",
@@ -34,8 +34,6 @@ ohos_unittest("add_white_list_infos_callbackl_test") {
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${fwk_utils_path}/include",
"${fwk_utils_path}/include/log",
"${innerkits_path}/include",
"${innerkits_path}/src",
"${ipc_path}/include",
@@ -34,8 +34,6 @@ ohos_unittest("distributed_input_client_test") {
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${fwk_utils_path}/include",
"${fwk_utils_path}/include/log",
"${innerkits_path}/include",
"${innerkits_path}/src",
"${ipc_path}/include",
@@ -34,8 +34,6 @@ ohos_unittest("del_white_list_infos_callbackl_test") {
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${fwk_utils_path}/include",
"${fwk_utils_path}/include/log",
"${innerkits_path}/include",
"${innerkits_path}/src",
"${ipc_path}/include",
@@ -34,8 +34,6 @@ ohos_unittest("dinput_source_callback_test") {
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${fwk_utils_path}/include",
"${fwk_utils_path}/include/log",
"${innerkits_path}/include",
"${innerkits_path}/src",
"${ipc_path}/include",
-2
View File
@@ -34,8 +34,6 @@ ohos_unittest("distributed_input_ipc_test") {
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${fwk_utils_path}/include",
"${fwk_utils_path}/include/log",
"${innerkits_path}/include",
"${innerkits_path}/src",
"${ipc_path}/include",
@@ -34,8 +34,6 @@ ohos_unittest("unprepare_d_input_call_back_test") {
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${fwk_utils_path}/include",
"${fwk_utils_path}/include/log",
"${innerkits_path}/include",
"${innerkits_path}/src",
"${ipc_path}/include",
@@ -34,8 +34,6 @@ ohos_unittest("unregister_d_input_call_back_test") {
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${fwk_utils_path}/include",
"${fwk_utils_path}/include/log",
"${innerkits_path}/include",
"${innerkits_path}/src",
"${ipc_path}/include",
+1 -3
View File
@@ -22,8 +22,6 @@ ohos_shared_library("libdinput_collector") {
"${frameworks_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${utils_path}/include",
"//third_party/json/include",
"${fwk_interfaces_path}/include",
@@ -44,7 +42,7 @@ ohos_shared_library("libdinput_collector") {
deps = [
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
"//third_party/openssl:libcrypto_static",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
@@ -33,8 +33,6 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") {
"${frameworks_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${utils_path}/include",
"//third_party/json/include",
"${fwk_interfaces_path}/include",
@@ -64,7 +62,7 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") {
deps = [
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
"//third_party/openssl:libcrypto_static",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
-2
View File
@@ -26,8 +26,6 @@ ohos_shared_library("libdinput_sink") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"${services_sink_path}/transport/include",
"${services_sink_path}/inputcollector/include",
@@ -39,8 +39,6 @@ ohos_unittest("distributed_input_sinkmanager_test") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"//third_party/json/include",
"${services_sink_path}/inputcollector/include",
@@ -89,7 +87,7 @@ ohos_unittest("distributed_input_sinkmanager_test") {
"${services_sink_path}/transport:libdinput_sink_trans",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
"//third_party/openssl:libcrypto_static",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
-3
View File
@@ -22,9 +22,6 @@ ohos_shared_library("libdinput_sink_trans") {
"${frameworks_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${service_common}/include",
"${dfx_utils_path}/include",
@@ -35,8 +35,6 @@ ohos_unittest("distributed_input_sinktrans_test") {
"${fwk_common_path}/utils/include",
"${frameworks_path}/include",
"${fwk_interfaces_path}/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"//third_party/json/include",
"${dfx_utils_path}/include",
+1 -3
View File
@@ -22,8 +22,6 @@ ohos_shared_library("libdinput_inject") {
"${frameworks_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"//third_party/json/include",
"${dfx_utils_path}/include",
@@ -50,7 +48,7 @@ ohos_shared_library("libdinput_inject") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
"//third_party/openssl:libcrypto_static",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
@@ -17,7 +17,6 @@
#include <sstream>
#include "dh_utils_tool.h"
#include "nlohmann/json.hpp"
#include "dinput_errcode.h"
@@ -36,8 +36,6 @@ ohos_unittest("distributed_input_inner_sourceinject_test") {
"${frameworks_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"//third_party/json/include",
"${dfx_utils_path}/include",
@@ -77,7 +75,7 @@ ohos_unittest("distributed_input_inner_sourceinject_test") {
"${innerkits_path}:libdinput_sdk",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
"//third_party/openssl:libcrypto_static",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
-2
View File
@@ -27,8 +27,6 @@ ohos_shared_library("libdinput_source") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"${services_source_path}/inputinject/include",
"${services_source_path}/transport/include",
@@ -39,8 +39,6 @@ ohos_unittest("distributed_input_sourcemanager_test") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"//third_party/json/include",
"${services_source_path}/inputinject/include",
@@ -113,7 +111,7 @@ ohos_unittest("distributed_input_sourcemanager_test") {
"${innerkits_path}:libdinput_sdk",
"${services_source_path}/transport:libdinput_source_trans",
"//third_party/libevdev:libevdev",
"//third_party/openssl:libcrypto_static",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
-2
View File
@@ -22,8 +22,6 @@ ohos_shared_library("libdinput_source_trans") {
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${service_common}/include",
"${services_source_path}/inputinject/include",
@@ -35,9 +35,6 @@ ohos_unittest("distributed_input_sourcetrans_test") {
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${service_common}/include",
"//third_party/json/include",
-2
View File
@@ -22,8 +22,6 @@ ohos_shared_library("libdinput_trans_base") {
"${frameworks_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${service_common}/include",
"${dfx_utils_path}/include",
@@ -35,8 +35,6 @@ ohos_unittest("distributed_input_transbase_test") {
"${fwk_interfaces_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"${services_source_path}/inputinject/include",
"${dfx_utils_path}/include",
-2
View File
@@ -28,8 +28,6 @@ ohos_shared_library("libdinput_sink_handler") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${dfx_utils_path}/include",
"${utils_path}/include",
"${fwk_interfaces_path}/include",
-2
View File
@@ -39,8 +39,6 @@ ohos_unittest("distributed_input_sink_handler_test") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${dfx_utils_path}/include",
"${fwk_interfaces_path}/include",
-2
View File
@@ -28,8 +28,6 @@ ohos_shared_library("libdinput_source_handler") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${dfx_utils_path}/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
-2
View File
@@ -39,8 +39,6 @@ ohos_unittest("distributed_input_source_handler_test") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${dfx_utils_path}/include",
"${fwk_interfaces_path}/include",
@@ -36,8 +36,6 @@ ohos_fuzztest("DinputConfigDhFuzzTest") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
@@ -36,8 +36,6 @@ ohos_fuzztest("DinputInitSinkFuzzTest") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
@@ -36,8 +36,6 @@ ohos_fuzztest("DinputInitSourceFuzzTest") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
@@ -36,8 +36,6 @@ ohos_fuzztest("DinputReleaseSinkFuzzTest") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
@@ -36,8 +36,6 @@ ohos_fuzztest("DinputReleaseSourceFuzzTest") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
@@ -36,8 +36,6 @@ ohos_fuzztest("DinputSubscribeLocalDhFuzzTest") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
@@ -38,8 +38,6 @@ ohos_fuzztest("DistributedInputClientFuzzTest") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
@@ -38,8 +38,6 @@ ohos_fuzztest("DistributedInputKitFuzzTest") {
"${common_path}/include",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"//third_party/json/include",
"${utils_path}/include",
"${fwk_interfaces_path}/include",
@@ -31,8 +31,6 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") {
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"//third_party/json/include",
"${dfx_utils_path}/include",
@@ -30,8 +30,6 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") {
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"${services_source_path}/inputinject/include",
"${services_source_path}/transport/include",
@@ -30,8 +30,6 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") {
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_interfaces_path}/include",
"${fwk_utils_path}/include/log",
"${fwk_utils_path}/include",
"${service_common}/include",
"${services_source_path}/inputinject/include",
"${services_source_path}/transport/include",
+1 -3
View File
@@ -19,8 +19,6 @@ ohos_shared_library("libdinput_utils") {
include_dirs = [
"${fwk_common_path}/utils/include",
"${fwk_common_path}/log/include",
"${fwk_utils_path}/include",
"${fwk_utils_path}/include/log",
"//third_party/json/include",
"${utils_path}/include",
"${common_path}/include",
@@ -44,7 +42,7 @@ ohos_shared_library("libdinput_utils") {
"LOG_DOMAIN=0xD004100",
]
deps = [ "//third_party/openssl:libcrypto_static" ]
deps = [ "//third_party/openssl:libcrypto_shared" ]
external_deps = [
"c_utils:utils",
+1 -3
View File
@@ -30,8 +30,6 @@ ohos_unittest("distributed_input_utils_test") {
include_dirs = [
"${fwk_common_path}/utils/include",
"${fwk_common_path}/log/include",
"${fwk_utils_path}/include",
"${fwk_utils_path}/include/log",
"${utils_path}/include",
"${utils_path}/test/unittest",
"${common_path}/include",
@@ -68,7 +66,7 @@ ohos_unittest("distributed_input_utils_test") {
deps = [
"${utils_path}:libdinput_utils",
"//third_party/openssl:libcrypto_static",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [