From 564e6a45c00db6fded05ba60de759b99cd3e11c1 Mon Sep 17 00:00:00 2001 From: wuqi0105 Date: Mon, 4 Sep 2023 11:01:43 +0800 Subject: [PATCH] Add Any with no rtti Signed-off-by: wuqi0105 --- .../test/unittest/BUILD.gn | 1 - .../av_trans_engine/av_receiver/BUILD.gn | 1 - .../av_receiver/src/av_receiver_engine.cpp | 2 +- .../test/unittest/av_receiver_engine/BUILD.gn | 3 +- .../av_receiver_engine_provider/BUILD.gn | 3 +- .../av_trans_engine/av_sender/BUILD.gn | 1 - .../test/unittest/av_sender_engine/BUILD.gn | 3 +- .../av_sender_engine_provider/BUILD.gn | 3 +- av_transport/av_trans_engine/filters/BUILD.gn | 4 +-- .../av_transport_input_filter.cpp | 30 +++++++++---------- .../av_transport_output_filter.cpp | 2 +- .../av_transport_input_filter_test/BUILD.gn | 3 +- .../av_transport_output_filter_test/BUILD.gn | 3 +- .../av_trans_engine/plugin/plugins/BUILD.gn | 1 - .../av_trans_input/daudio_input_test/BUILD.gn | 3 +- .../dscreen_input_test/BUILD.gn | 3 +- .../dsoftbus_input_audio_test/BUILD.gn | 3 +- .../dsoftbus_input_test/BUILD.gn | 3 +- .../daudio_output_test/BUILD.gn | 3 +- .../dscreen_output_test/BUILD.gn | 3 +- .../dsoftbus_output_audio_test/BUILD.gn | 3 +- .../dsoftbus_output_test/BUILD.gn | 3 +- .../histreamer_ability_querier/BUILD.gn | 1 - 23 files changed, 33 insertions(+), 52 deletions(-) diff --git a/av_transport/av_trans_control_center/test/unittest/BUILD.gn b/av_transport/av_trans_control_center/test/unittest/BUILD.gn index 44cb3efa..a0220aea 100644 --- a/av_transport/av_trans_control_center/test/unittest/BUILD.gn +++ b/av_transport/av_trans_control_center/test/unittest/BUILD.gn @@ -68,7 +68,6 @@ ohos_unittest("AvTransControlCenterTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", ] cflags_cc = cflags diff --git a/av_transport/av_trans_engine/av_receiver/BUILD.gn b/av_transport/av_trans_engine/av_receiver/BUILD.gn index 42e5771f..a4d263ce 100644 --- a/av_transport/av_trans_engine/av_receiver/BUILD.gn +++ b/av_transport/av_trans_engine/av_receiver/BUILD.gn @@ -101,7 +101,6 @@ ohos_shared_library("distributed_av_receiver") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", ] cflags_cc = cflags diff --git a/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp b/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp index 89436350..0d7adb0a 100644 --- a/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp +++ b/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp @@ -459,7 +459,7 @@ void AVReceiverEngine::OnEvent(const OHOS::Media::Event &event) switch (event.type) { case OHOS::Media::EventType::EVENT_BUFFER_PROGRESS: { - if (event.param.SameTypeWith(typeid(std::shared_ptr))) { + if (Plugin::Any::IsSameTypeWith>(event.param)) { auto hisBuffer = Plugin::AnyCast>(event.param); TRUE_RETURN(hisBuffer == nullptr, "hisBuffer is null"); HandleOutputBuffer(hisBuffer); diff --git a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/BUILD.gn b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/BUILD.gn index ac59d667..37fd7ff8 100644 --- a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/BUILD.gn +++ b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/BUILD.gn @@ -44,7 +44,6 @@ ohos_unittest("AvReceiverEngineTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", "-Dprotected = public", @@ -56,7 +55,7 @@ ohos_unittest("AvReceiverEngineTest") { "${engine_path}/av_receiver:distributed_av_receiver", "${filters_path}:avtrans_input_filter", "${filters_path}:avtrans_output_filter", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] defines = [ diff --git a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine_provider/BUILD.gn b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine_provider/BUILD.gn index b6012422..f65580a9 100644 --- a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine_provider/BUILD.gn +++ b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine_provider/BUILD.gn @@ -44,7 +44,6 @@ ohos_unittest("AvReceiverEngineProviderTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", "-Dprotected = public", @@ -56,7 +55,7 @@ ohos_unittest("AvReceiverEngineProviderTest") { "${engine_path}/av_receiver:distributed_av_receiver", "${filters_path}:avtrans_input_filter", "${filters_path}:avtrans_output_filter", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] defines = [ diff --git a/av_transport/av_trans_engine/av_sender/BUILD.gn b/av_transport/av_trans_engine/av_sender/BUILD.gn index e817cd6e..45a4bef7 100644 --- a/av_transport/av_trans_engine/av_sender/BUILD.gn +++ b/av_transport/av_trans_engine/av_sender/BUILD.gn @@ -96,7 +96,6 @@ ohos_shared_library("distributed_av_sender") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", ] cflags_cc = cflags diff --git a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/BUILD.gn b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/BUILD.gn index 6ccbf075..47effd5b 100644 --- a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/BUILD.gn +++ b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/BUILD.gn @@ -44,7 +44,6 @@ ohos_unittest("AvSenderEngineTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", "-Dprotected = public", @@ -56,7 +55,7 @@ ohos_unittest("AvSenderEngineTest") { "${engine_path}/av_sender:distributed_av_sender", "${filters_path}:avtrans_input_filter", "${filters_path}:avtrans_output_filter", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] defines = [ diff --git a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine_provider/BUILD.gn b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine_provider/BUILD.gn index 111c7b41..84b0c161 100644 --- a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine_provider/BUILD.gn +++ b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine_provider/BUILD.gn @@ -44,7 +44,6 @@ ohos_unittest("AvSenderEngineProviderTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", "-Dprotected = public", @@ -56,7 +55,7 @@ ohos_unittest("AvSenderEngineProviderTest") { "${engine_path}/av_sender:distributed_av_sender", "${filters_path}:avtrans_input_filter", "${filters_path}:avtrans_output_filter", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] defines = [ diff --git a/av_transport/av_trans_engine/filters/BUILD.gn b/av_transport/av_trans_engine/filters/BUILD.gn index 5afe86d9..2cb961f4 100644 --- a/av_transport/av_trans_engine/filters/BUILD.gn +++ b/av_transport/av_trans_engine/filters/BUILD.gn @@ -47,7 +47,6 @@ ohos_source_set("avtrans_input_filter") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Wno-unused-but-set-variable", "-Wno-format", @@ -59,6 +58,7 @@ ohos_source_set("avtrans_input_filter") { defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"av_transport_input_filter\"", + "HST_ANY_WITH_NO_RTTI", "LOG_DOMAIN=0xD004100", ] } @@ -95,7 +95,6 @@ ohos_source_set("avtrans_output_filter") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Wno-unused-but-set-variable", "-Wno-format", @@ -107,6 +106,7 @@ ohos_source_set("avtrans_output_filter") { defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"av_transport_output_filter\"", + "HST_ANY_WITH_NO_RTTI", "LOG_DOMAIN=0xD004100", ] } diff --git a/av_transport/av_trans_engine/filters/av_transport_input/av_transport_input_filter.cpp b/av_transport/av_trans_engine/filters/av_transport_input/av_transport_input_filter.cpp index e0876194..494bcafb 100644 --- a/av_transport/av_trans_engine/filters/av_transport_input/av_transport_input_filter.cpp +++ b/av_transport/av_trans_engine/filters/av_transport_input/av_transport_input_filter.cpp @@ -203,7 +203,7 @@ ErrorCode AVInputFilter::FindPlugin() OSAL::ScopedLock lock(inputFilterMutex_); std::string mime; if (paramsMap_.find(Tag::MIME) == paramsMap_.end() || - !paramsMap_[Tag::MIME].SameTypeWith(typeid(std::string))) { + !Plugin::Any::IsSameTypeWith(paramsMap_[Tag::MIME])) { AVTRANS_LOGE("Must set mime correctly first"); return ErrorCode::ERROR_INVALID_PARAMETER_VALUE; } @@ -320,7 +320,7 @@ ErrorCode AVInputFilter::ConfigMeta(Plugin::Meta& meta) AVTRANS_LOGI("ConfigMeta start!"); OSAL::ScopedLock lock(inputFilterMutex_); if (paramsMap_.find(Tag::MEDIA_TYPE) == paramsMap_.end() || - !paramsMap_[Tag::MEDIA_TYPE].SameTypeWith(typeid(Plugin::MediaType))) { + !Plugin::Any::IsSameTypeWith(paramsMap_[Tag::MEDIA_TYPE])) { AVTRANS_LOGE("MEDIA_TYPE in ParamsMap is not exist!"); return ErrorCode::ERROR_NOT_EXISTED; } @@ -337,37 +337,37 @@ ErrorCode AVInputFilter::ConfigVideoMeta(Plugin::Meta& meta) { AVTRANS_LOGI("ConfigVideoMeta start!"); if (paramsMap_.find(Tag::VIDEO_WIDTH) != paramsMap_.end() && - paramsMap_[Tag::VIDEO_WIDTH].SameTypeWith(typeid(int))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::VIDEO_WIDTH])) { uint32_t width = static_cast(Plugin::AnyCast(paramsMap_[Tag::VIDEO_WIDTH])); AVTRANS_LOGI("ConfigVideoMeta: VIDEO_WIDTH is %d", width); meta.Set(width); } if (paramsMap_.find(Tag::VIDEO_HEIGHT) != paramsMap_.end() && - paramsMap_[Tag::VIDEO_HEIGHT].SameTypeWith(typeid(int))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::VIDEO_HEIGHT])) { uint32_t height = static_cast(Plugin::AnyCast(paramsMap_[Tag::VIDEO_HEIGHT])); AVTRANS_LOGI("ConfigVideoMeta: VIDEO_HEIGHT is %d", height); meta.Set(height); } if (paramsMap_.find(Tag::MEDIA_BITRATE) != paramsMap_.end() && - paramsMap_[Tag::MEDIA_BITRATE].SameTypeWith(typeid(int))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::MEDIA_BITRATE])) { int64_t mediaBitRate = Plugin::AnyCast(paramsMap_[Tag::MEDIA_BITRATE]); AVTRANS_LOGI("ConfigVideoMeta: MEDIA_BITRATE is %ld", mediaBitRate); meta.Set(mediaBitRate); } if (paramsMap_.find(Tag::VIDEO_FRAME_RATE) != paramsMap_.end() && - paramsMap_[Tag::VIDEO_FRAME_RATE].SameTypeWith(typeid(int))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::VIDEO_FRAME_RATE])) { uint32_t videoFrameRate = static_cast(Plugin::AnyCast(paramsMap_[Tag::VIDEO_FRAME_RATE])); AVTRANS_LOGI("ConfigVideoMeta: VIDEO_FRAME_RATE is %d", videoFrameRate); meta.Set(videoFrameRate); } if (paramsMap_.find(Tag::VIDEO_BIT_STREAM_FORMAT) != paramsMap_.end() && - paramsMap_[Tag::VIDEO_BIT_STREAM_FORMAT].SameTypeWith(typeid(VideoBitStreamFormat))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::VIDEO_BIT_STREAM_FORMAT])) { auto videoBitStreamFormat = Plugin::AnyCast(paramsMap_[Tag::VIDEO_BIT_STREAM_FORMAT]); AVTRANS_LOGI("ConfigVideoMeta: VIDEO_BIT_STREAM_FORMAT is %d", videoBitStreamFormat); meta.Set(std::vector{videoBitStreamFormat}); } if (paramsMap_.find(Tag::VIDEO_PIXEL_FORMAT) != paramsMap_.end() && - paramsMap_[Tag::VIDEO_PIXEL_FORMAT].SameTypeWith(typeid(VideoPixelFormat))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::VIDEO_PIXEL_FORMAT])) { auto videoPixelFormat = Plugin::AnyCast(paramsMap_[Tag::VIDEO_PIXEL_FORMAT]); AVTRANS_LOGI("ConfigVideoMeta: VIDEO_PIXEL_FORMAT is %d", videoPixelFormat); meta.Set(videoPixelFormat); @@ -411,43 +411,43 @@ ErrorCode AVInputFilter::ConfigAudioMeta(Plugin::Meta& meta) { AVTRANS_LOGI("ConfigAudioMeta start"); if (paramsMap_.find(Tag::AUDIO_CHANNELS) != paramsMap_.end() && - paramsMap_[Tag::AUDIO_CHANNELS].SameTypeWith(typeid(int))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::AUDIO_CHANNELS])) { uint32_t audioChannel = static_cast(Plugin::AnyCast(paramsMap_[Tag::AUDIO_CHANNELS])); AVTRANS_LOGI("ConfigAudioMeta: AUDIO_CHANNELS is %d", audioChannel); meta.Set(audioChannel); } if (paramsMap_.find(Tag::AUDIO_SAMPLE_RATE) != paramsMap_.end() && - paramsMap_[Tag::AUDIO_SAMPLE_RATE].SameTypeWith(typeid(int))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::AUDIO_SAMPLE_RATE])) { uint32_t sampleRate = static_cast(Plugin::AnyCast(paramsMap_[Tag::AUDIO_SAMPLE_RATE])); AVTRANS_LOGI("ConfigAudioMeta: AUDIO_SAMPLE_RATE is %d", sampleRate); meta.Set(sampleRate); } if (paramsMap_.find(Tag::MEDIA_BITRATE) != paramsMap_.end() && - paramsMap_[Tag::MEDIA_BITRATE].SameTypeWith(typeid(int))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::MEDIA_BITRATE])) { int64_t mediaBitRate = Plugin::AnyCast(paramsMap_[Tag::MEDIA_BITRATE]); AVTRANS_LOGI("ConfigAudioMeta: MEDIA_BITRATE is %ld", mediaBitRate); meta.Set(mediaBitRate); } if (paramsMap_.find(Tag::AUDIO_SAMPLE_FORMAT) != paramsMap_.end() && - paramsMap_[Tag::AUDIO_SAMPLE_FORMAT].SameTypeWith(typeid(int))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::AUDIO_SAMPLE_FORMAT])) { auto audioSampleFmtPtr = Plugin::AnyCast(paramsMap_[Tag::AUDIO_SAMPLE_FORMAT]); AVTRANS_LOGI("ConfigAudioMeta: AUDIO_SAMPLE_FORMAT is %d", audioSampleFmtPtr); meta.Set(TransAudioSampleFormat(audioSampleFmtPtr)); } if (paramsMap_.find(Tag::AUDIO_CHANNEL_LAYOUT) != paramsMap_.end() && - paramsMap_[Tag::AUDIO_CHANNEL_LAYOUT].SameTypeWith(typeid(int))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::AUDIO_CHANNEL_LAYOUT])) { auto layoutPtr = Plugin::AnyCast(paramsMap_[Tag::AUDIO_CHANNEL_LAYOUT]); AVTRANS_LOGI("ConfigAudioMeta: AUDIO_CHANNEL_LAYOUT is %d", layoutPtr); meta.Set(TransAudioChannelLayout(layoutPtr)); } if (paramsMap_.find(Tag::AUDIO_SAMPLE_PER_FRAME) != paramsMap_.end() && - paramsMap_[Tag::AUDIO_SAMPLE_PER_FRAME].SameTypeWith(typeid(int))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::AUDIO_SAMPLE_PER_FRAME])) { uint32_t samplePerFrame = static_cast(Plugin::AnyCast(paramsMap_[Tag::AUDIO_SAMPLE_PER_FRAME])); AVTRANS_LOGI("ConfigAudioMeta: AUDIO_SAMPLE_PER_FRAME is %d", samplePerFrame); meta.Set(samplePerFrame); } if (paramsMap_.find(Tag::AUDIO_AAC_LEVEL) != paramsMap_.end() && - paramsMap_[Tag::AUDIO_AAC_LEVEL].SameTypeWith(typeid(int))) { + Plugin::Any::IsSameTypeWith(paramsMap_[Tag::AUDIO_AAC_LEVEL])) { uint32_t aacLevel = static_cast(Plugin::AnyCast(paramsMap_[Tag::AUDIO_AAC_LEVEL])); AVTRANS_LOGI("ConfigAudioMeta: AUDIO_AAC_LEVEL is %d", aacLevel); meta.Set(aacLevel); diff --git a/av_transport/av_trans_engine/filters/av_transport_output/av_transport_output_filter.cpp b/av_transport/av_trans_engine/filters/av_transport_output/av_transport_output_filter.cpp index 4c46b491..2fb4e4be 100644 --- a/av_transport/av_trans_engine/filters/av_transport_output/av_transport_output_filter.cpp +++ b/av_transport/av_trans_engine/filters/av_transport_output/av_transport_output_filter.cpp @@ -180,7 +180,7 @@ ErrorCode AVOutputFilter::FindPlugin() OSAL::ScopedLock lock(outputFilterMutex_); std::string mime; if (paramsMap_.find(Tag::MIME) == paramsMap_.end() || - !paramsMap_[Tag::MIME].SameTypeWith(typeid(std::string))) { + !Plugin::Any::IsSameTypeWith(paramsMap_[Tag::MIME])) { AVTRANS_LOGE("Must set mime correctly first"); return ErrorCode::ERROR_INVALID_PARAMETER_VALUE; } diff --git a/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/BUILD.gn b/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/BUILD.gn index 44dba5d1..fffa43cc 100644 --- a/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/BUILD.gn +++ b/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/BUILD.gn @@ -38,7 +38,6 @@ ohos_unittest("AvTransportInputFilterTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", "-Dprotected = public", @@ -54,7 +53,7 @@ ohos_unittest("AvTransportInputFilterTest") { deps = [ "${engine_path}/filters:avtrans_input_filter", "${plugin_path}/plugins/av_trans_input/dsoftbus_input:plugin_AVTransDsoftbusInput", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", "//third_party/libevdev:libevdev", ] diff --git a/av_transport/av_trans_engine/filters/test/av_transport_output_filter_test/BUILD.gn b/av_transport/av_trans_engine/filters/test/av_transport_output_filter_test/BUILD.gn index fc5ec098..5103d7f9 100644 --- a/av_transport/av_trans_engine/filters/test/av_transport_output_filter_test/BUILD.gn +++ b/av_transport/av_trans_engine/filters/test/av_transport_output_filter_test/BUILD.gn @@ -38,7 +38,6 @@ ohos_unittest("AvTransportOutputFilterTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", "-Dprotected = public", @@ -54,7 +53,7 @@ ohos_unittest("AvTransportOutputFilterTest") { deps = [ "${engine_path}/filters:avtrans_output_filter", "${plugin_path}/plugins/av_trans_output/dsoftbus_output_audio:plugin_AVTransDsoftbusOutputAudio", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", "//third_party/libevdev:libevdev", ] diff --git a/av_transport/av_trans_engine/plugin/plugins/BUILD.gn b/av_transport/av_trans_engine/plugin/plugins/BUILD.gn index aae9560b..4346d0ec 100644 --- a/av_transport/av_trans_engine/plugin/plugins/BUILD.gn +++ b/av_transport/av_trans_engine/plugin/plugins/BUILD.gn @@ -16,7 +16,6 @@ config("avtrans_cflags") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Wno-unused-but-set-variable", "-Wno-format", diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_input/daudio_input_test/BUILD.gn b/av_transport/av_trans_engine/plugin/test/av_trans_input/daudio_input_test/BUILD.gn index 5659a819..0e7bd934 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_input/daudio_input_test/BUILD.gn +++ b/av_transport/av_trans_engine/plugin/test/av_trans_input/daudio_input_test/BUILD.gn @@ -40,7 +40,6 @@ ohos_unittest("DaudioInputPluginTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", ] @@ -48,7 +47,7 @@ ohos_unittest("DaudioInputPluginTest") { deps = [ "${plugin_path}/plugins/av_trans_input/daudio_input:plugin_AVTransDaudioInput", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] external_deps = [ diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_input/dscreen_input_test/BUILD.gn b/av_transport/av_trans_engine/plugin/test/av_trans_input/dscreen_input_test/BUILD.gn index 089c40f9..19bd5140 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_input/dscreen_input_test/BUILD.gn +++ b/av_transport/av_trans_engine/plugin/test/av_trans_input/dscreen_input_test/BUILD.gn @@ -38,7 +38,7 @@ ohos_unittest("DscreenInputTest") { deps = [ "${plugin_path}/plugins/av_trans_input/dscreen_input:plugin_AVTransDscreenInput", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] external_deps = [ @@ -56,7 +56,6 @@ ohos_unittest("DscreenInputTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", ] diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_audio_test/BUILD.gn b/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_audio_test/BUILD.gn index c2fcb300..7aae125d 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_audio_test/BUILD.gn +++ b/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_audio_test/BUILD.gn @@ -37,7 +37,7 @@ ohos_unittest("DsoftbusInputAudioPluginTest") { deps = [ "${plugin_path}/plugins/av_trans_input/dsoftbus_input_audio:plugin_AVTransDsoftbusInputAudio", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] external_deps = [ @@ -54,7 +54,6 @@ ohos_unittest("DsoftbusInputAudioPluginTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", ] diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_test/BUILD.gn b/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_test/BUILD.gn index f2b068a8..b986fd15 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_test/BUILD.gn +++ b/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_test/BUILD.gn @@ -37,7 +37,7 @@ ohos_unittest("DsoftbusInputPluginTest") { deps = [ "${plugin_path}/plugins/av_trans_input/dsoftbus_input:plugin_AVTransDsoftbusInput", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] external_deps = [ @@ -54,7 +54,6 @@ ohos_unittest("DsoftbusInputPluginTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", ] diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_output/daudio_output_test/BUILD.gn b/av_transport/av_trans_engine/plugin/test/av_trans_output/daudio_output_test/BUILD.gn index 93b05a64..ee8db272 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_output/daudio_output_test/BUILD.gn +++ b/av_transport/av_trans_engine/plugin/test/av_trans_output/daudio_output_test/BUILD.gn @@ -39,7 +39,6 @@ ohos_unittest("DaudioOutputPluginTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", ] @@ -47,7 +46,7 @@ ohos_unittest("DaudioOutputPluginTest") { deps = [ "${plugin_path}/plugins/av_trans_output/daudio_output:plugin_AVTransDaudioOutput", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] external_deps = [ diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_output/dscreen_output_test/BUILD.gn b/av_transport/av_trans_engine/plugin/test/av_trans_output/dscreen_output_test/BUILD.gn index c60f56b9..84c4948c 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_output/dscreen_output_test/BUILD.gn +++ b/av_transport/av_trans_engine/plugin/test/av_trans_output/dscreen_output_test/BUILD.gn @@ -40,7 +40,6 @@ ohos_unittest("DscreenOutputPluginTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", ] @@ -48,7 +47,7 @@ ohos_unittest("DscreenOutputPluginTest") { deps = [ "${plugin_path}/plugins/av_trans_output/dscreen_output:plugin_AVTransDscreenOutput", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] external_deps = [ diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_audio_test/BUILD.gn b/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_audio_test/BUILD.gn index 63910712..6d3aad0f 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_audio_test/BUILD.gn +++ b/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_audio_test/BUILD.gn @@ -39,7 +39,6 @@ ohos_unittest("DsoftbusOutputAudioPluginTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", ] @@ -47,7 +46,7 @@ ohos_unittest("DsoftbusOutputAudioPluginTest") { deps = [ "${plugin_path}/plugins/av_trans_output/dsoftbus_output_audio:plugin_AVTransDsoftbusOutputAudio", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] external_deps = [ diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_test/BUILD.gn b/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_test/BUILD.gn index d1091c4e..d5f0bbc9 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_test/BUILD.gn +++ b/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_test/BUILD.gn @@ -39,7 +39,6 @@ ohos_unittest("DsoftbusOutputPluginTest") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Dprivate = public", ] @@ -47,7 +46,7 @@ ohos_unittest("DsoftbusOutputPluginTest") { deps = [ "${plugin_path}/plugins/av_trans_output/dsoftbus_output:plugin_AVTransDsoftbusOutput", - "//third_party/googletest:gtest_rtti", + "//third_party/googletest:gtest", ] external_deps = [ diff --git a/av_transport/av_trans_handler/histreamer_ability_querier/BUILD.gn b/av_transport/av_trans_handler/histreamer_ability_querier/BUILD.gn index 67b91eb7..91066dd3 100644 --- a/av_transport/av_trans_handler/histreamer_ability_querier/BUILD.gn +++ b/av_transport/av_trans_handler/histreamer_ability_querier/BUILD.gn @@ -58,7 +58,6 @@ ohos_shared_library("histreamer_ability_querier") { "-O2", "-fPIC", "-Wall", - "-frtti", "-fexceptions", "-Wno-unused-but-set-variable", "-Wno-format", -- Gitee