diff --git a/bundle.json b/bundle.json index a22f764ddd16e1af712e18cc7bf370bd920f8881..d3216ec3f8ab37c8ceaf0ab5b2865d7448b4a6d2 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 2371814ebbffa9b7dafce4cad63914446f1d517c..0e5b05e6dafc6e858a779e719ffc85eefb840be0 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 b76208429817ec459759480d8c3d124808e2c9dd..4628c205cdc020c86c889c86829a9dd9715e54a3 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 5e4d453257a568a42d21cdcfb94894e932556992..b4f509739f796fd0788a6c78207131ccf2d4a7c3 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 b2a83b3214bc85aa3e37cb204c4de25eed011931..345c9209b3aefd8d21426147e59f36cfe1b00054 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 baf1b6e24d3b453bf7b3482cad8926121296fce4..30da30b7838453132f77db050dba3ed5916b64e1 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 f94329a85cc7dd58f71ee70bb5ff79bf76d88629..a2cc09679c16891077bc23ef1ab1d9fcf536ace9 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 22389041aac0807546c214b19611f39781c098f5..afccc61b6f10b3ff239d0f38a01516dc22c73cbd 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 a89516ecd243e0b8708d9ce5aed750c44929bdec..c415dc4c333a4f5bb5ec96c227f6685ea0634209 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 b83013b82110ee8c46f4801d7af44aff55743ccc..791403c62ec3461e6946a79fd573f194ec0a4f25 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 5b2080de001b582bc227491c366387b3674e6cc4..95155da57ba43a4510b9c4814b6aac4192093b57 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 d3e99ec9778a6939f6a176419907d872c461ce27..a7d6bc9b9bbc3b91fcdfdf19be4ff076c2523f32 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 dca6d8205476e8f61f0b4f06ed613ed6e81c7334..9b55ff115f4a74c4f70e87149c4172148154be68 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 f929eecb03e8e67cac7baa1f8ddada54096a4122..5f052a7419cd3c6e5b024681f0de6b0e0938fbaa 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 308026bf06ffeaf7943a5547a8a3970507e907bc..7de326aaa4546a971a88e36fbea77004f1f4356b 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 41a826de92cf1f1629cb4adb7f18cd2ed56f8c3c..65328a624b41b625b949783c4541d53db5b0d5bc 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 000e3cc0f6b288e29f4f77c2329ad0b55a2e3f19..17d7fe3978409836fa66682b733635b07cd2a7e9 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 7aa0a686e2bd3586ce157414efa52082c5e13a03..f38e2f47f727ae93c6e0a533a23290906d8c229a 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 4920d6fe6c4942557ab123dc2014c70f13b9e154..49dc1eddf44449cf04dcd268d33fab9e16d864be 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 ee6415933da97234ceda0b4beee344c805dfca49..d30f19fbc683140c8874f0fb8fb7a72a8e9ab3c3 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 cd69fa880030553e4edf4e4830abab46d013a131..3687d40b70e798c39eceefa4424babf97282fa7d 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 16e7e596c7fa9c7c42b698c5cd66ad6e19e53c00..d383974e10d9c44cfa666b3e45498cd2b58ccd5d 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 b6b1c708e8d22786208b6f13077898031b5716cd..7b3e198d9e6efb5c01631094153cd0711035ff53 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/", ]