From 582369335b6ace48dc02f3f5b5716f42bd69526d Mon Sep 17 00:00:00 2001 From: panzhi Date: Sat, 7 Oct 2023 05:24:54 +0000 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8json?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: panzhi --- bundle.json | 1 - common/BUILD.gn | 1 - .../native_cpp/test/unittest/screensinktest/BUILD.gn | 1 - .../native_cpp/test/unittest/screensourcetest/BUILD.gn | 1 - screenhandler/BUILD.gn | 1 - screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn | 5 +---- .../test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn | 5 +---- screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn | 5 +---- screenhandler/test/unittest/screenhandler/BUILD.gn | 5 +---- services/common/test/unittest/utils/BUILD.gn | 1 - services/screenservice/sinkservice/BUILD.gn | 1 - services/screenservice/sourceservice/BUILD.gn | 1 - .../test/unittest/sinkservice/screenregionmgr/BUILD.gn | 1 - .../test/unittest/sourceservice/dscreenmgr/BUILD.gn | 1 - services/screentransport/screensinktrans/BUILD.gn | 1 - services/screentransport/screensourcetrans/BUILD.gn | 1 - .../screentransport/test/unittest/screendatachannel/BUILD.gn | 5 +---- .../test/unittest/screensinkprocessor/BUILD.gn | 5 +---- .../screentransport/test/unittest/screensinktrans/BUILD.gn | 5 +---- .../test/unittest/screensourceprocessor/BUILD.gn | 1 - .../screentransport/test/unittest/screensourcetrans/BUILD.gn | 1 - .../test/unittest/screentranstestutils/BUILD.gn | 1 - services/softbusadapter/test/unittest/BUILD.gn | 1 - 23 files changed, 7 insertions(+), 44 deletions(-) diff --git a/bundle.json b/bundle.json index a22f764d..d3216ec3 100644 --- a/bundle.json +++ b/bundle.json @@ -46,7 +46,6 @@ "distributed_hardware_fwk" ], "third_party": [ - "json", "libjpeg-turbo" ] }, diff --git a/common/BUILD.gn b/common/BUILD.gn index 2371814e..0e5b05e6 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -19,7 +19,6 @@ import( ohos_shared_library("distributed_screen_utils") { include_dirs = [ "${services_path}/common/utils/include", - "//third_party/json/include", "${common_path}/include", "${fwk_common_path}/utils/include", ] diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index b7620842..4628c205 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -20,7 +20,6 @@ module_out_path = "distributed_screen/source_trans_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//third_party/json/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include", ] diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn index 5e4d4532..b4f50973 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -20,7 +20,6 @@ module_out_path = "distributed_screen/source_trans_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//third_party/json/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include", ] diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index b2a83b32..345c9209 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -18,7 +18,6 @@ import( ohos_shared_library("distributed_screen_handler") { include_dirs = [ - "//third_party/json/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include", ] diff --git a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn index baf1b6e2..30da30b7 100644 --- a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn @@ -23,10 +23,7 @@ ohos_fuzztest("PluginHardwareFuzzTest") { fuzz_config_file = "${distributedscreen_path}/screenhandler/test/fuzztest/pluginhardware_fuzzer" - include_dirs = [ - "//third_party/json/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn index f94329a8..a2cc0967 100644 --- a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn @@ -23,10 +23,7 @@ ohos_fuzztest("RegisterPluginListenerFuzzTest") { fuzz_config_file = "${distributedscreen_path}/screenhandler/test/fuzztest/registerpluginlistener_fuzzer" - include_dirs = [ - "//third_party/json/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn index 22389041..afccc61b 100644 --- a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn @@ -23,10 +23,7 @@ ohos_fuzztest("UnPluginHardwareFuzzTest") { fuzz_config_file = "${distributedscreen_path}/screenhandler/test/fuzztest/unpluginhardware_fuzzer" - include_dirs = [ - "//third_party/json/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/screenhandler/test/unittest/screenhandler/BUILD.gn b/screenhandler/test/unittest/screenhandler/BUILD.gn index a89516ec..c415dc4c 100644 --- a/screenhandler/test/unittest/screenhandler/BUILD.gn +++ b/screenhandler/test/unittest/screenhandler/BUILD.gn @@ -19,10 +19,7 @@ module_out_path = "distributed_screen/dscreen_handler_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "//third_party/json/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "./include", diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index b83013b8..791403c6 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//third_party/json/include", "${fwk_common_path}/utils/include", "${fwk_common_path}/log/include", "${fwk_utils_path}/include/log", diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 5b2080de..95155da5 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -18,7 +18,6 @@ import( ohos_shared_library("distributed_screen_sink") { include_dirs = [ - "//third_party/json/include", "${fwk_common_path}/utils/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", ] diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index d3e99ec9..a7d6bc9b 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -18,7 +18,6 @@ import( ohos_shared_library("distributed_screen_source") { include_dirs = [ - "//third_party/json/include", "//third_party/libjpeg-turbo", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", "${distributedhardwarefwk_path}/utils/include", diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index dca6d820..9b55ff11 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -20,7 +20,6 @@ module_out_path = "distributed_screen/dscreen_sink_service_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//third_party/json/include", "${fwk_common_path}/utils/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", "${distributedhardwarefwk_path}/utils/include", diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index f929eecb..5f052a74 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -20,7 +20,6 @@ module_out_path = "distributed_screen/DscreenMgrTest" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//third_party/json/include", "${driver_path}/interfaces/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", "${distributedhardwarefwk_path}/common/utils/include", diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 308026bf..7de326aa 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -18,7 +18,6 @@ import( ohos_shared_library("distributed_screen_sinktrans") { include_dirs = [ - "//third_party/json/include", "//third_party/libjpeg", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/inner_kits/include", diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index 41a826de..65328a62 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -18,7 +18,6 @@ import( ohos_shared_library("distributed_screen_sourcetrans") { include_dirs = [ - "//third_party/json/include", "//third_party/libjpeg-turbo", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/inner_kits/include", diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn index 000e3cc0..17d7fe39 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -19,10 +19,7 @@ module_out_path = "distributed_screen/data_channel_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "//third_party/json/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "./include", diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index 7aa0a686..f38e2f47 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -21,10 +21,7 @@ module_out_path = "distributed_screen/sink_processor_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "//third_party/json/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "./include", diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 4920d6fe..49dc1edd 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -21,10 +21,7 @@ module_out_path = "distributed_screen/sink_trans_test" config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "//third_party/json/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "./include", diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index ee641593..d30f19fb 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -20,7 +20,6 @@ module_out_path = "distributed_screen/source_processor_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//third_party/json/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", ] diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index cd69fa88..3687d40b 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -20,7 +20,6 @@ module_out_path = "distributed_screen/source_trans_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//third_party/json/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", diff --git a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn index 16e7e596..d383974e 100644 --- a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn +++ b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn @@ -20,7 +20,6 @@ module_out_path = "distributed_screen/screen_callback_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//third_party/json/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index b6b1c708..7b3e198d 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -20,7 +20,6 @@ module_out_path = "distributed_screen/soft_bus_adapter_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//third_party/json/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", ] -- Gitee