提交 17317112 编写于 作者: O openharmony_ci 提交者: Gitee

!282 add macro for disable video component

Merge pull request !282 from niulihua/master
...@@ -105,7 +105,6 @@ shared_library("ui") { ...@@ -105,7 +105,6 @@ shared_library("ui") {
"frameworks/components/ui_texture_mapper.cpp", "frameworks/components/ui_texture_mapper.cpp",
"frameworks/components/ui_time_picker.cpp", "frameworks/components/ui_time_picker.cpp",
"frameworks/components/ui_toggle_button.cpp", "frameworks/components/ui_toggle_button.cpp",
"frameworks/components/ui_video.cpp",
"frameworks/components/ui_view.cpp", "frameworks/components/ui_view.cpp",
"frameworks/components/ui_view_group.cpp", "frameworks/components/ui_view_group.cpp",
"frameworks/core/render_manager.cpp", "frameworks/core/render_manager.cpp",
...@@ -162,13 +161,13 @@ shared_library("ui") { ...@@ -162,13 +161,13 @@ shared_library("ui") {
"frameworks/engines/gfx/gfx_engine_manager.cpp", "frameworks/engines/gfx/gfx_engine_manager.cpp",
"frameworks/engines/gfx/hi3516/hi3516_engine.cpp", "frameworks/engines/gfx/hi3516/hi3516_engine.cpp",
] ]
include_dirs = [ "//foundation/graphic/ui/frameworks" ] include_dirs = [ "//foundation/graphic/ui/frameworks" ]
deps = [ deps = [
"//build/lite/config/component/cJSON:cjson_shared", "//build/lite/config/component/cJSON:cjson_shared",
"//foundation/graphic/surface:lite_surface", "//foundation/graphic/surface:lite_surface",
"//foundation/graphic/utils:lite_graphic_hals", "//foundation/graphic/utils:lite_graphic_hals",
"//foundation/graphic/wms:lite_wms", "//foundation/graphic/wms:lite_wms",
"//foundation/multimedia/media_lite/frameworks/player_lite:player_lite",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
"//third_party/freetype:freetype", "//third_party/freetype:freetype",
"//third_party/giflib:libgif", "//third_party/giflib:libgif",
...@@ -178,6 +177,17 @@ shared_library("ui") { ...@@ -178,6 +177,17 @@ shared_library("ui") {
"//third_party/qrcodegen:qrcodegen", "//third_party/qrcodegen:qrcodegen",
] ]
if (enable_video_component) {
defines += [ "ENABLE_VIDEO_COMPONENT=1" ]
source += [
"frameworks/components/ui_video.cpp",
]
deps += [
"//foundation/multimedia/media_lite/frameworks/player_lite:player_lite",
]
}
public_deps = [ "//foundation/graphic/utils:lite_graphic_utils" ] public_deps = [ "//foundation/graphic/utils:lite_graphic_utils" ]
public_configs = [ ":graphic_define_config" ] public_configs = [ ":graphic_define_config" ]
cflags = [ cflags = [
......
...@@ -61,7 +61,6 @@ test_sources = [ ...@@ -61,7 +61,6 @@ test_sources = [
"../uitest/test_ui_scroll_view/ui_test_ui_scroll_view.cpp", "../uitest/test_ui_scroll_view/ui_test_ui_scroll_view.cpp",
"../uitest/test_ui_swipe_view/ui_test_ui_swipe_view.cpp", "../uitest/test_ui_swipe_view/ui_test_ui_swipe_view.cpp",
"../uitest/test_vector_font/ui_test_vector_font.cpp", "../uitest/test_vector_font/ui_test_vector_font.cpp",
"../uitest/test_video/ui_test_video.cpp",
"../uitest/test_view_bitmap/ui_test_view_bitmap.cpp", "../uitest/test_view_bitmap/ui_test_view_bitmap.cpp",
"../uitest/test_view_bounds/ui_test_view_bounds.cpp", "../uitest/test_view_bounds/ui_test_view_bounds.cpp",
"../uitest/test_view_group/ui_test_view_group.cpp", "../uitest/test_view_group/ui_test_view_group.cpp",
...@@ -75,6 +74,12 @@ test_sources = [ ...@@ -75,6 +74,12 @@ test_sources = [
"src/ui_test_group.cpp", "src/ui_test_group.cpp",
] ]
if (enable_video_component) {
test_sources += [
"../uitest/test_video/ui_test_video.cpp",
]
}
auto_test_sources = [ auto_test_sources = [
"../uitest/test_layout/ui_auto_test_basic_layout.cpp", "../uitest/test_layout/ui_auto_test_basic_layout.cpp",
"../uitest/test_render/ui_auto_test_render.cpp", "../uitest/test_render/ui_auto_test_render.cpp",
......
...@@ -142,8 +142,10 @@ void UITestGroup::SetUpTestCase() ...@@ -142,8 +142,10 @@ void UITestGroup::SetUpTestCase()
testCaseList_.PushBack(TestCaseInfo{"UIViewGroup", new UITestViewGroup()}); testCaseList_.PushBack(TestCaseInfo{"UIViewGroup", new UITestViewGroup()});
testCaseList_.PushBack(TestCaseInfo{"View Bitmap", new UITestViewBitmap()}); testCaseList_.PushBack(TestCaseInfo{"View Bitmap", new UITestViewBitmap()});
#ifndef VERSION_LITE #ifndef VERSION_LITE
#if ENABLE_VIDEO_COMPONENT
testCaseList_.PushBack(TestCaseInfo{"Video", new UITestVideo()}); testCaseList_.PushBack(TestCaseInfo{"Video", new UITestVideo()});
#endif #endif
#endif
#if ENABLE_FOCUS_MANAGER #if ENABLE_FOCUS_MANAGER
testCaseList_.PushBack(TestCaseInfo{"FocusManager", new UITestFocusManager()}); testCaseList_.PushBack(TestCaseInfo{"FocusManager", new UITestFocusManager()});
#endif #endif
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//build/lite/config/subsystem/graphic/config.gni")
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
group("lite_graphic_ui_test") { group("lite_graphic_ui_test") {
...@@ -76,7 +76,6 @@ if (ohos_build_type == "debug") { ...@@ -76,7 +76,6 @@ if (ohos_build_type == "debug") {
"components/ui_swipe_view_unit_test.cpp", "components/ui_swipe_view_unit_test.cpp",
"components/ui_time_picker_unit_test.cpp", "components/ui_time_picker_unit_test.cpp",
"components/ui_toggle_button_unit_test.cpp", "components/ui_toggle_button_unit_test.cpp",
"components/ui_video_unit_test.cpp",
"components/ui_view_group_unit_test.cpp", "components/ui_view_group_unit_test.cpp",
"components/ui_view_unit_test.cpp", "components/ui_view_unit_test.cpp",
"dfx/event_injector_unit_test.cpp", "dfx/event_injector_unit_test.cpp",
...@@ -98,6 +97,11 @@ if (ohos_build_type == "debug") { ...@@ -98,6 +97,11 @@ if (ohos_build_type == "debug") {
"rotate/ui_rotate_input_unit_test.cpp", "rotate/ui_rotate_input_unit_test.cpp",
"themes/theme_manager_unit_test.cpp", "themes/theme_manager_unit_test.cpp",
] ]
if (enable_video_component) {
sources += [
"components/ui_video_unit_test.cpp",
]
}
deps = [ deps = [
"//foundation/graphic/ui:ui", "//foundation/graphic/ui:ui",
"//foundation/multimedia/media_lite/frameworks/player_lite:player_lite", "//foundation/multimedia/media_lite/frameworks/player_lite:player_lite",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册