From cc417780f0cb7f3c657dd144ae9e071c16d2bb88 Mon Sep 17 00:00:00 2001 From: itihobaev Date: Wed, 17 Apr 2024 15:35:32 +0300 Subject: [PATCH 01/11] Removed gni imports from other modules Signed-off-by: itihobaev Change-Id: I5ca7900487c834b2b069d9ac6bead6b8c338e445 --- ace_platforms.gni | 40 ++++ adapter/ohos/build/common.gni | 191 ++++++++++++++++++ adapter/ohos/build/config.gni | 33 +++ adapter/ohos/build/config_ng.gni | 26 +++ adapter/ohos/build/platform.gni | 38 ++++ adapter/preview/build/config.gni | 23 +++ adapter/preview/build/config_linux.gni | 21 ++ adapter/preview/build/config_mac.gni | 20 ++ adapter/preview/build/config_windows.gni | 32 +++ adapter/preview/build/platform.gni | 50 +++++ adapter/preview/build/preview_common.gni | 117 +++++++++++ interfaces/kits/napi/graphic/drawing/BUILD.gn | 2 +- rosen/build/flutter/glfw/BUILD.gn | 2 +- rosen/build/harfbuzz/BUILD.gn | 2 +- rosen/build/icu/BUILD.gn | 2 +- .../2d_engine/rosen_text/properties/BUILD.gn | 1 - .../2d_engine/rosen_text/skia_txt/BUILD.gn | 26 ++- .../modules/2d_engine/rosen_text/ui/BUILD.gn | 1 - rosen/modules/2d_graphics/BUILD.gn | 2 +- .../modules/2d_graphics/drawing_ndk/BUILD.gn | 2 +- .../modules/effect/skia_effectChain/BUILD.gn | 1 - .../src/platform/darwin/BUILD.gn | 1 - .../src/platform/windows/BUILD.gn | 1 - rosen/samples/2d_graphics/BUILD.gn | 1 - rosen/samples/2d_graphics/test/BUILD.gn | 1 - rosen/test/frame_analyzer/unittest/BUILD.gn | 1 - .../systemtest/pipeline/BUILD.gn | 1 - .../render_service/unittest/memory/BUILD.gn | 1 - .../render_service/unittest/pipeline/BUILD.gn | 1 - .../unittest/screen_manager/BUILD.gn | 2 +- .../render_service/unittest/system/BUILD.gn | 1 - .../unittest/transaction/BUILD.gn | 1 - .../unittest/animation/BUILD.gn | 2 +- .../unittest/benchmarks/BUILD.gn | 2 +- .../unittest/command/BUILD.gn | 2 +- .../unittest/common/BUILD.gn | 2 +- .../unittest/delegate/BUILD.gn | 2 +- .../unittest/offscreen_render/BUILD.gn | 2 +- .../unittest/pipeline/BUILD.gn | 2 +- .../unittest/platform/ohos/BUILD.gn | 2 +- .../unittest/platform/ohos/backend/BUILD.gn | 2 +- .../unittest/property/BUILD.gn | 2 +- .../unittest/render/BUILD.gn | 2 +- .../unittest/screen_manager/BUILD.gn | 2 +- .../unittest/transaction/BUILD.gn | 2 +- .../unittest/animation/BUILD.gn | 2 +- .../unittest/jank_detector/BUILD.gn | 2 +- .../unittest/pipeline/BUILD.gn | 2 +- .../unittest/transaction/BUILD.gn | 2 +- .../unittest/ui/BUILD.gn | 2 +- 50 files changed, 633 insertions(+), 47 deletions(-) create mode 100644 ace_platforms.gni create mode 100644 adapter/ohos/build/common.gni create mode 100644 adapter/ohos/build/config.gni create mode 100644 adapter/ohos/build/config_ng.gni create mode 100644 adapter/ohos/build/platform.gni create mode 100644 adapter/preview/build/config.gni create mode 100644 adapter/preview/build/config_linux.gni create mode 100644 adapter/preview/build/config_mac.gni create mode 100644 adapter/preview/build/config_windows.gni create mode 100644 adapter/preview/build/platform.gni create mode 100644 adapter/preview/build/preview_common.gni diff --git a/ace_platforms.gni b/ace_platforms.gni new file mode 100644 index 0000000000..970779208d --- /dev/null +++ b/ace_platforms.gni @@ -0,0 +1,40 @@ +# Copyright (c) 2024 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +use_mingw_win = "${current_os}_${current_cpu}" == "mingw_x86_64" +ace_root = "//foundation/arkui/ace_engine" +graphic_2d_root = "//foundation/graphic/graphic_2d" +ace_platforms = [] + +_ace_adapter_dir = rebase_path("$graphic_2d_root/adapter", root_build_dir) +_adapters = exec_script("$ace_root/build/search.py", [ _ace_adapter_dir ], "list lines") +foreach(item, _adapters) { + import_var = { + } + import_var = { + import("$graphic_2d_root/adapter/$item/build/platform.gni") + } + + if (defined(import_var.platforms)) { + foreach(platform, import_var.platforms) { + if (!is_arkui_x || + (is_arkui_x && defined(platform.cross_platform_support) && + platform.cross_platform_support)) { + if (defined(platform.name)) { + ace_platforms += [ platform ] + } + } + } + } +} diff --git a/adapter/ohos/build/common.gni b/adapter/ohos/build/common.gni new file mode 100644 index 0000000000..82a4dd3f72 --- /dev/null +++ b/adapter/ohos/build/common.gni @@ -0,0 +1,191 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") +import("//build/ohos/ace/ace_args.gni") +import("//foundation/graphic/graphic_2d/graphic_config.gni") + +defines = [ + "OHOS_PLATFORM", + "OHOS_STANDARD_SYSTEM", +] + +js_engines = [] +ark_engine = { + engine_name = "ark" + engine_path = "jsi" + engine_defines = [ "USE_ARK_ENGINE" ] +} +js_engines += [ ark_engine ] + +if (ace_enable_gpu) { + disable_gpu = false +} else { + disable_gpu = true +} + +use_build_in_js_engine = true +use_external_icu = "shared" +ohos_standard_fontmgr = true +sk_use_hilog = true +rich_components_support = true +advance_components_support = false +remote_window_support = true +effect_component_support = true +xcomponent_components_support = true +pixel_map_support = true +js_pa_support = true +connect_server_support = true +hdc_register_support = true +pa_engine_path = "adapter/ohos/entrance/pa_engine" +enable_rosen_backend = true +if (defined(global_parts_info.distributeddatamgr_udmf) && + defined(global_parts_info.msdp_device_status)) { + enable_drag_framework = true +} else { + enable_drag_framework = false +} +if (defined(global_parts_info.inputmethod_imf)) { + enable_standard_input = true +} else { + enable_standard_input = false +} +build_container_scope_lib = true +multiple_window_support = true +enable_ability_component = true +video_components_support = true +video_support_jsstack = true +image_components_support = true +preview_support = false +if (defined(global_parts_info.distributeddatamgr_pasteboard)) { + enable_system_clipboard = true +} else { + enable_system_clipboard = false +} +enable_image_compression = true +if (defined(global_parts_info.graphic_graphic_3d)) { + model_component_support = true +} else { + model_component_support = false +} + +window_scene_support = true +dynamic_component_support = true +vsync_timeout_check = true + +if (defined(preview_support) && preview_support) { + defines += [ "PREVIEW" ] +} + +if (defined(image_components_support) && image_components_support) { + defines += [ "IMAGE_SUPPORTED" ] +} + +if (defined(video_components_support) && video_components_support) { + defines += [ "VIDEO_SUPPORTED" ] +} + +if (defined(video_support_jsstack) && video_support_jsstack) { + defines += [ "SUPPORT_JSSTACK" ] +} + +if (defined(is_experiment_build) && is_experiment_build) { + web_components_support = true +} + +if (defined(web_components_support) && web_components_support) { + defines += [ "WEB_SUPPORTED" ] +} + +if (defined(enable_ability_component) && enable_ability_component) { + defines += [ "ABILITY_COMPONENT_SUPPORTED" ] +} + +if (disable_gpu || enable_rosen_backend) { + defines += [ "GPU_DISABLED" ] +} + +if (disable_gpu) { + defines += [ "UPLOAD_GPU_DISABLED" ] +} + +if (remote_window_support) { + defines += [ "REMOTE_WINDOW_SUPPORTED" ] +} + +if (effect_component_support) { + defines += [ "EFFECT_COMPONENT_SUPPORTED" ] +} + +if (xcomponent_components_support) { + defines += [ "XCOMPONENT_SUPPORTED" ] +} + +if (pixel_map_support) { + defines += [ "PIXEL_MAP_SUPPORTED" ] +} + +if (enable_rosen_backend) { + defines += [ "ENABLE_ROSEN_BACKEND" ] +} + +if (enable_standard_input) { + defines += [ "ENABLE_STANDARD_INPUT" ] +} + +if (multiple_window_support) { + defines += [ "MULTIPLE_WINDOW_SUPPORTED" ] +} + +if (model_component_support) { + defines += [ "MODEL_COMPONENT_SUPPORTED" ] +} + +if (use_build_in_js_engine) { + defines += [ "HIDDEN_SYMBOL" ] +} + +if (window_scene_support) { + defines += [ "WINDOW_SCENE_SUPPORTED" ] +} + +if (enable_drag_framework) { + defines += [ "ENABLE_DRAG_FRAMEWORK" ] +} + +if (defined(global_parts_info.multimedia_media_library)) { + media_library_exists = true + defines += [ "MEDIA_LIBRARY_EXISTS" ] +} else { + media_library_exists = false +} + +if (defined(global_parts_info.hiviewdfx_hichecker)) { + hichecker_exists = true + defines += [ "HICHECKER_EXISTS" ] +} else { + hichecker_exists = false +} + +if (dynamic_component_support) { + defines += [ "DYNAMIC_COMPONENT_SUPPORT" ] +} + +if (vsync_timeout_check) { + defines += [ "VSYNC_TIMEOUT_CHECK" ] +} + +cflags_cc = [ + "-Wno-thread-safety-attributes", + "-Wno-thread-safety-analysis", +] diff --git a/adapter/ohos/build/config.gni b/adapter/ohos/build/config.gni new file mode 100644 index 0000000000..5c664dc324 --- /dev/null +++ b/adapter/ohos/build/config.gni @@ -0,0 +1,33 @@ +# Copyright (c) 2024 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("common.gni") + +form_components_support = true +plugin_components_support = true + +defines += [ + "FORM_SUPPORTED", + "PLUGIN_COMPONENT_SUPPORTED", +] + +platform_deps = [ + "//foundation/arkui/ace_engine/adapter/ohos/entrance:ace_ohos_standard_entrance_ohos", + "//foundation/arkui/ace_engine/adapter/ohos/osal:ace_osal_ohos_ohos", +] + +libace_target = "//foundation/arkui/ace_engine/build:libace" + +if (is_asan) { + libace_target = "//foundation/arkui/ace_engine/build:libace_compatible" +} diff --git a/adapter/ohos/build/config_ng.gni b/adapter/ohos/build/config_ng.gni new file mode 100644 index 0000000000..c8b2090a75 --- /dev/null +++ b/adapter/ohos/build/config_ng.gni @@ -0,0 +1,26 @@ +# Copyright (c) 2024 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("common.gni") + +form_components_support = false +plugin_components_support = false + +defines += [ "NG_BUILD" ] + +platform_deps = [ + "//foundation/arkui/ace_engine/adapter/ohos/entrance:ace_ohos_standard_entrance_ohos_ng", + "//foundation/arkui/ace_engine/adapter/ohos/osal:ace_osal_ohos_ohos_ng", +] + +libace_target = "//foundation/arkui/ace_engine/build:libace" diff --git a/adapter/ohos/build/platform.gni b/adapter/ohos/build/platform.gni new file mode 100644 index 0000000000..fb01d7b631 --- /dev/null +++ b/adapter/ohos/build/platform.gni @@ -0,0 +1,38 @@ +# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") + +platforms = [] + +is_ohos_standard_system = is_standard_system && !is_arkui_x +if (is_ohos_standard_system) { + ohos_platform = { + name = "ohos" + config = { + import("config.gni") + } + } + ohos_platform_ng = { + name = "ohos_ng" + config = { + import("config_ng.gni") + } + } + + platforms += [ ohos_platform ] + + if (!is_asan) { + platforms += [ ohos_platform_ng ] + } +} diff --git a/adapter/preview/build/config.gni b/adapter/preview/build/config.gni new file mode 100644 index 0000000000..8467bc7b9f --- /dev/null +++ b/adapter/preview/build/config.gni @@ -0,0 +1,23 @@ +# Copyright (c) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# source code for Windows. +use_mingw_win = "${current_os}_${current_cpu}" == "mingw_x86_64" + +# source code for linux. +use_linux = "${current_os}_${current_cpu}" == "linux_x64" + +# source code for mac. + +use_mac = "${current_os}_${current_cpu}" == "mac_x64" || + "${current_os}_${current_cpu}" == "mac_arm64" diff --git a/adapter/preview/build/config_linux.gni b/adapter/preview/build/config_linux.gni new file mode 100644 index 0000000000..8393f4c6ea --- /dev/null +++ b/adapter/preview/build/config_linux.gni @@ -0,0 +1,21 @@ +# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("preview_common.gni") + +# linux platform defines and configs +defines += [ + "LINUX_PLATFORM", + "GPU_DISABLED", + "SK_BUILD_FONT_MGR_FOR_PREVIEW_LINUX", +] diff --git a/adapter/preview/build/config_mac.gni b/adapter/preview/build/config_mac.gni new file mode 100644 index 0000000000..5bdfafed3c --- /dev/null +++ b/adapter/preview/build/config_mac.gni @@ -0,0 +1,20 @@ +# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("preview_common.gni") + +# windows platform defines and configs +defines += [ + "MAC_PLATFORM", + "SK_BUILD_FONT_MGR_FOR_PREVIEW_MAC", +] diff --git a/adapter/preview/build/config_windows.gni b/adapter/preview/build/config_windows.gni new file mode 100644 index 0000000000..5aa8dbc455 --- /dev/null +++ b/adapter/preview/build/config_windows.gni @@ -0,0 +1,32 @@ +# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("preview_common.gni") + +# windows platform defines and configs +defines += [ + "WINDOWS_PLATFORM", + "_USE_MATH_DEFINES", + "NOGDI", + "U_CHARSET_IS_UTF8=1", + "SK_BUILD_FOR_WIN", + "SK_BUILD_FONT_MGR_FOR_PREVIEW_WIN", +] + +cflags_cc += [ + "-DWINVER=0x0601", + "-Wno-inconsistent-dllimport", + "-Wno-macro-redefined", + "-Wno-missing-braces", + "-Wno-used-but-marked-unused", +] diff --git a/adapter/preview/build/platform.gni b/adapter/preview/build/platform.gni new file mode 100644 index 0000000000..eb25f0049e --- /dev/null +++ b/adapter/preview/build/platform.gni @@ -0,0 +1,50 @@ +# Copyright (c) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") +import("config.gni") + +platforms = [] + +if (use_mingw_win) { + windows_platform = { + name = "windows" + config = { + import("config_windows.gni") + } + } + + platforms += [ windows_platform ] +} + +if (use_mac) { + mac_platform = { + name = "mac" + config = { + import("config_mac.gni") + } + } + + platforms += [ mac_platform ] +} + +if (use_linux) { + linux_platform = { + name = "linux" + config = { + import("config_linux.gni") + } + } + + platforms += [ linux_platform ] +} diff --git a/adapter/preview/build/preview_common.gni b/adapter/preview/build/preview_common.gni new file mode 100644 index 0000000000..d2d197d727 --- /dev/null +++ b/adapter/preview/build/preview_common.gni @@ -0,0 +1,117 @@ +# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +xcomponent_components_support = false +form_components_support = false +remote_window_support = false +effect_component_support = false +use_external_icu = "shared" +rich_components_support = true +ohos_standard_fontmgr = true +image_components_support = false +plugin_components_support = false +enable_ability_component = false +enable_system_clipboard = false +advance_components_support = false +connect_server_support = false +enable_rosen_backend = true +enable_standard_input = false +video_components_support = false +web_components_support = false +preview_support = true +model_component_support = false +window_scene_support = false +build_for_preview = true + +# js engine common configs +js_pa_support = false +use_build_in_js_engine = true + +ark_engine = { + engine_name = "ark" + engine_path = "jsi" + engine_defines = [ "USE_ARK_ENGINE" ] +} +js_engines = [ ark_engine ] + +platform_deps = [ + "//foundation/arkui/ace_engine/adapter/preview/entrance:preview_entrance_source", + "//foundation/arkui/ace_engine/adapter/preview/external:preview_external_source", + "//foundation/arkui/ace_engine/adapter/preview/inspector:preview_inspector_source", + "//foundation/arkui/ace_engine/adapter/preview/osal:preview_osal_source", +] + +cflags_cc = [ + "-std=c++17", + "-Wno-thread-safety-attributes", + "-Wno-thread-safety-analysis", + "-Wno-ignored-attributes", + "-Wno-unknown-pragmas", + "-g1", +] + +defines = [ "UNICODE" ] + +if (defined(web_components_support) && web_components_support) { + defines += [ "WEB_SUPPORTED" ] +} + +if (defined(video_components_support) && video_components_support) { + defines += [ "VIDEO_SUPPORTED" ] +} + +if (defined(xcomponent_components_support) && xcomponent_components_support) { + defines += [ "XCOMPONENT_SUPPORTED" ] +} + +if (defined(form_components_support) && form_components_support) { + defines += [ "FORM_SUPPORTED" ] +} + +if (defined(remote_window_support) && remote_window_support) { + defines += [ "REMOTE_WINDOW_SUPPORTED" ] +} + +if (defined(effect_component_support) && effect_component_support) { + defines += [ "EFFECT_COMPONENT_SUPPORTED" ] +} + +if (defined(image_components_support) && image_components_support) { + defines += [ "IMAGE_SUPPORTED" ] +} + +if (defined(plugin_components_support) && plugin_components_support) { + defines += [ "PLUGIN_COMPONENT_SUPPORTED" ] +} + +if (defined(enable_ability_component) && enable_ability_component) { + defines += [ "ABILITY_COMPONENT_SUPPORTED" ] +} + +if (defined(preview_support) && preview_support) { + defines += [ "PREVIEW" ] +} + +if (defined(model_component_support) && model_component_support) { + defines += [ "MODEL_COMPONENT_SUPPORTED" ] +} + +if (defined(enable_rosen_backend) && enable_rosen_backend) { + defines += [ "ENABLE_ROSEN_BACKEND" ] +} + +if (defined(window_scene_support) && window_scene_support) { + defines += [ "WINDOW_SCENE_SUPPORTED" ] +} + +libace_target = "//foundation/arkui/ace_engine/build:libace_compatible" diff --git a/interfaces/kits/napi/graphic/drawing/BUILD.gn b/interfaces/kits/napi/graphic/drawing/BUILD.gn index f2240ef1bb..3f44efa43e 100644 --- a/interfaces/kits/napi/graphic/drawing/BUILD.gn +++ b/interfaces/kits/napi/graphic/drawing/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") + group("drawingnapi") { deps = [ diff --git a/rosen/build/flutter/glfw/BUILD.gn b/rosen/build/flutter/glfw/BUILD.gn index 84a1b230d7..ba53b1af2e 100644 --- a/rosen/build/flutter/glfw/BUILD.gn +++ b/rosen/build/flutter/glfw/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") config("flutter_glfw_config") { visibility = [ ":*" ] diff --git a/rosen/build/harfbuzz/BUILD.gn b/rosen/build/harfbuzz/BUILD.gn index 6d58f5caa4..d10eca30a5 100644 --- a/rosen/build/harfbuzz/BUILD.gn +++ b/rosen/build/harfbuzz/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") skia_root = "//third_party/skia" diff --git a/rosen/build/icu/BUILD.gn b/rosen/build/icu/BUILD.gn index 81cefc01ff..33d970d8a9 100644 --- a/rosen/build/icu/BUILD.gn +++ b/rosen/build/icu/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") skia_root = "//third_party/skia" diff --git a/rosen/modules/2d_engine/rosen_text/properties/BUILD.gn b/rosen/modules/2d_engine/rosen_text/properties/BUILD.gn index 8b2c83d6d0..650a786f7b 100755 --- a/rosen/modules/2d_engine/rosen_text/properties/BUILD.gn +++ b/rosen/modules/2d_engine/rosen_text/properties/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") import("$graphic_2d_root/rosen/modules/2d_engine/rosen_text/config.gni") diff --git a/rosen/modules/2d_engine/rosen_text/skia_txt/BUILD.gn b/rosen/modules/2d_engine/rosen_text/skia_txt/BUILD.gn index b452b9257c..4593e10325 100644 --- a/rosen/modules/2d_engine/rosen_text/skia_txt/BUILD.gn +++ b/rosen/modules/2d_engine/rosen_text/skia_txt/BUILD.gn @@ -12,12 +12,10 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") import("$graphic_2d_root/rosen/modules/2d_engine/rosen_text/config.gni") -import("//third_party/skia/modules/skshaper/skshaper.gni") -import("//third_party/skia/modules/skunicode/skunicode.gni") config("skia_libtxt_config") { include_dirs = [ @@ -33,6 +31,8 @@ config("skia_libtxt_config") { } txt_root = "$rosen_root/modules/2d_engine/rosen_text/skia_txt/" +skunicode_root = "//third_party/skia/modules/skunicode" +skshaper_root = "//third_party/skia/modules/skshaper" template("skia_libtxt") { forward_variables_from(invoker, "*") @@ -206,13 +206,18 @@ ohos_source_set("skia_unicode") { ] defines = [] - public = skia_unicode_public + public = [ "$skunicode_root/include/SkUnicode.h" ] defines += [ "SKUNICODE_IMPLEMENTATION=1" ] - sources = skia_unicode_sources + sources = [ "$skunicode_root/src/SkUnicode.cpp" ] defines += [ "SK_UNICODE_AVAILABLE" ] - sources += skia_unicode_icu_sources + sources += [ + "$skunicode_root/src/SkUnicode_icu.cpp", + "$skunicode_root/src/SkUnicode_icu.h", + "$skunicode_root/src/SkUnicode_icu_bidi.cpp", + "$skunicode_root/src/SkUnicode_icu_bidi.h", + ] defines += [ "SK_UNICODE_ICU_IMPLEMENTATION" ] - sources += skia_unicode_builtin_icu_sources + sources += [ "$skunicode_root/src/SkUnicode_icu_builtin.cpp" ] platform = current_os if (platform == "mingw") { @@ -250,8 +255,11 @@ ohos_source_set("skia_shaper") { } defines += [ "SKSHAPER_IMPLEMENTATION=1" ] - sources = skia_shaper_primitive_sources - sources += skia_shaper_harfbuzz_sources + sources = [ + "$skshaper_root/src/SkShaper.cpp", + "$skshaper_root/src/SkShaper_primitive.cpp", + "$skshaper_root/src/SkShaper_harfbuzz.cpp", + ] platform = current_os if (platform == "mingw") { diff --git a/rosen/modules/2d_engine/rosen_text/ui/BUILD.gn b/rosen/modules/2d_engine/rosen_text/ui/BUILD.gn index 55443cc59a..4ceb230df6 100755 --- a/rosen/modules/2d_engine/rosen_text/ui/BUILD.gn +++ b/rosen/modules/2d_engine/rosen_text/ui/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") import("$graphic_2d_root/rosen/modules/2d_engine/rosen_text/config.gni") diff --git a/rosen/modules/2d_graphics/BUILD.gn b/rosen/modules/2d_graphics/BUILD.gn index 763a61f31a..c45f3bc411 100755 --- a/rosen/modules/2d_graphics/BUILD.gn +++ b/rosen/modules/2d_graphics/BUILD.gn @@ -12,8 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("$graphic_2d_root/rosen/modules/2d_engine/rosen_text/config.gni") drawing_root = "$rosen_root/modules/2d_graphics" diff --git a/rosen/modules/2d_graphics/drawing_ndk/BUILD.gn b/rosen/modules/2d_graphics/drawing_ndk/BUILD.gn index 1350cb655e..07d019f71a 100755 --- a/rosen/modules/2d_graphics/drawing_ndk/BUILD.gn +++ b/rosen/modules/2d_graphics/drawing_ndk/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") import("$graphic_2d_root/rosen/modules/2d_engine/rosen_text/config.gni") diff --git a/rosen/modules/effect/skia_effectChain/BUILD.gn b/rosen/modules/effect/skia_effectChain/BUILD.gn index 29a9262790..7cd351a43b 100644 --- a/rosen/modules/effect/skia_effectChain/BUILD.gn +++ b/rosen/modules/effect/skia_effectChain/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") -import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") ## Build libskeffectchain.so diff --git a/rosen/modules/render_service_base/src/platform/darwin/BUILD.gn b/rosen/modules/render_service_base/src/platform/darwin/BUILD.gn index abd5851141..9497c7a1f2 100644 --- a/rosen/modules/render_service_base/src/platform/darwin/BUILD.gn +++ b/rosen/modules/render_service_base/src/platform/darwin/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") import("../../../config.gni") diff --git a/rosen/modules/render_service_base/src/platform/windows/BUILD.gn b/rosen/modules/render_service_base/src/platform/windows/BUILD.gn index 9defb94116..ec50b399c5 100644 --- a/rosen/modules/render_service_base/src/platform/windows/BUILD.gn +++ b/rosen/modules/render_service_base/src/platform/windows/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") import("../../../config.gni") diff --git a/rosen/samples/2d_graphics/BUILD.gn b/rosen/samples/2d_graphics/BUILD.gn index 94d2b93c03..71f48ffa2d 100644 --- a/rosen/samples/2d_graphics/BUILD.gn +++ b/rosen/samples/2d_graphics/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") ohos_executable("drawing_engine_sample") { diff --git a/rosen/samples/2d_graphics/test/BUILD.gn b/rosen/samples/2d_graphics/test/BUILD.gn index 410e2877ed..04c4b0ebc2 100644 --- a/rosen/samples/2d_graphics/test/BUILD.gn +++ b/rosen/samples/2d_graphics/test/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") ## Build drawing_sample {{{ config("drawing_sample_config") { diff --git a/rosen/test/frame_analyzer/unittest/BUILD.gn b/rosen/test/frame_analyzer/unittest/BUILD.gn index f0cf769feb..2fa4569f13 100644 --- a/rosen/test/frame_analyzer/unittest/BUILD.gn +++ b/rosen/test/frame_analyzer/unittest/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") ohos_unittest("frame_analyzer_test") { module_out_path = "graphic_2d/rosen/modules/frame_analyzer" diff --git a/rosen/test/render_service/render_service/systemtest/pipeline/BUILD.gn b/rosen/test/render_service/render_service/systemtest/pipeline/BUILD.gn index bd7ac60703..9991751b82 100644 --- a/rosen/test/render_service/render_service/systemtest/pipeline/BUILD.gn +++ b/rosen/test/render_service/render_service/systemtest/pipeline/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service/pipeline" diff --git a/rosen/test/render_service/render_service/unittest/memory/BUILD.gn b/rosen/test/render_service/render_service/unittest/memory/BUILD.gn index 3b560d742e..2afc89768f 100644 --- a/rosen/test/render_service/render_service/unittest/memory/BUILD.gn +++ b/rosen/test/render_service/render_service/unittest/memory/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service/memory" diff --git a/rosen/test/render_service/render_service/unittest/pipeline/BUILD.gn b/rosen/test/render_service/render_service/unittest/pipeline/BUILD.gn index 67b79173c1..4f352891a3 100644 --- a/rosen/test/render_service/render_service/unittest/pipeline/BUILD.gn +++ b/rosen/test/render_service/render_service/unittest/pipeline/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service/pipeline" diff --git a/rosen/test/render_service/render_service/unittest/screen_manager/BUILD.gn b/rosen/test/render_service/render_service/unittest/screen_manager/BUILD.gn index a5c77fa21d..9a988ba6ba 100644 --- a/rosen/test/render_service/render_service/unittest/screen_manager/BUILD.gn +++ b/rosen/test/render_service/render_service/unittest/screen_manager/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") module_output_path = "graphic/rosen_engine/render_service/screen_manager" diff --git a/rosen/test/render_service/render_service/unittest/system/BUILD.gn b/rosen/test/render_service/render_service/unittest/system/BUILD.gn index dd238333a8..13892d7755 100755 --- a/rosen/test/render_service/render_service/unittest/system/BUILD.gn +++ b/rosen/test/render_service/render_service/unittest/system/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service/system" diff --git a/rosen/test/render_service/render_service/unittest/transaction/BUILD.gn b/rosen/test/render_service/render_service/unittest/transaction/BUILD.gn index c79a988bad..7a3c6190a7 100644 --- a/rosen/test/render_service/render_service/unittest/transaction/BUILD.gn +++ b/rosen/test/render_service/render_service/unittest/transaction/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service/transaction" diff --git a/rosen/test/render_service/render_service_base/unittest/animation/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/animation/BUILD.gn index 3fb9135cd9..fd83d08dc0 100644 --- a/rosen/test/render_service/render_service_base/unittest/animation/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/animation/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service_base/animation" diff --git a/rosen/test/render_service/render_service_base/unittest/benchmarks/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/benchmarks/BUILD.gn index 504007e9f1..c6bef45e2e 100644 --- a/rosen/test/render_service/render_service_base/unittest/benchmarks/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/benchmarks/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") module_output_path = "graphic/rosen_engine/render_service_base/benchmarks" diff --git a/rosen/test/render_service/render_service_base/unittest/command/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/command/BUILD.gn index 1f2bfc625a..45b779e0b7 100644 --- a/rosen/test/render_service/render_service_base/unittest/command/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/command/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service_base/command" diff --git a/rosen/test/render_service/render_service_base/unittest/common/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/common/BUILD.gn index 2034a920d8..b791161c9b 100644 --- a/rosen/test/render_service/render_service_base/unittest/common/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/common/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service_base/common" diff --git a/rosen/test/render_service/render_service_base/unittest/delegate/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/delegate/BUILD.gn index 35840f7cc6..6b3136395a 100644 --- a/rosen/test/render_service/render_service_base/unittest/delegate/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/delegate/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") module_output_path = "graphic/rosen_engine/render_service_base/Delegate" diff --git a/rosen/test/render_service/render_service_base/unittest/offscreen_render/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/offscreen_render/BUILD.gn index 64dc4cb26f..3f202d841e 100644 --- a/rosen/test/render_service/render_service_base/unittest/offscreen_render/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/offscreen_render/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") module_output_path = "graphic/rosen_engine/render_service_base/offscreen_render" diff --git a/rosen/test/render_service/render_service_base/unittest/pipeline/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/pipeline/BUILD.gn index cfa28f388e..e23747bf4f 100644 --- a/rosen/test/render_service/render_service_base/unittest/pipeline/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/pipeline/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service_base/Pipeline" diff --git a/rosen/test/render_service/render_service_base/unittest/platform/ohos/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/platform/ohos/BUILD.gn index 56eb15b463..3503907bc9 100644 --- a/rosen/test/render_service/render_service_base/unittest/platform/ohos/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/platform/ohos/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service_base/platform/ohos" diff --git a/rosen/test/render_service/render_service_base/unittest/platform/ohos/backend/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/platform/ohos/backend/BUILD.gn index a647baf7ed..0fad08e22d 100644 --- a/rosen/test/render_service/render_service_base/unittest/platform/ohos/backend/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/platform/ohos/backend/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = diff --git a/rosen/test/render_service/render_service_base/unittest/property/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/property/BUILD.gn index 0fa1d74859..2d1539e7e1 100644 --- a/rosen/test/render_service/render_service_base/unittest/property/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/property/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") module_output_path = "graphic/rosen_engine/render_service_base/property" diff --git a/rosen/test/render_service/render_service_base/unittest/render/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/render/BUILD.gn index 1ded1d0aa4..a24768be65 100644 --- a/rosen/test/render_service/render_service_base/unittest/render/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/render/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") module_output_path = "graphic/rosen_engine/render_service_base/render" diff --git a/rosen/test/render_service/render_service_base/unittest/screen_manager/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/screen_manager/BUILD.gn index 9e344e27c0..7c75315c6d 100644 --- a/rosen/test/render_service/render_service_base/unittest/screen_manager/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/screen_manager/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") module_output_path = "graphic/rosen_engine/render_service_base/screen_manager" diff --git a/rosen/test/render_service/render_service_base/unittest/transaction/BUILD.gn b/rosen/test/render_service/render_service_base/unittest/transaction/BUILD.gn index f583ab238d..e3355c73a4 100644 --- a/rosen/test/render_service/render_service_base/unittest/transaction/BUILD.gn +++ b/rosen/test/render_service/render_service_base/unittest/transaction/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service_base/transaction" diff --git a/rosen/test/render_service/render_service_client/unittest/animation/BUILD.gn b/rosen/test/render_service/render_service_client/unittest/animation/BUILD.gn index 3114b89844..fca4dbd36a 100644 --- a/rosen/test/render_service/render_service_client/unittest/animation/BUILD.gn +++ b/rosen/test/render_service/render_service_client/unittest/animation/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") module_output_path = "graphic/rosen_engine/render_service_client/animation" diff --git a/rosen/test/render_service/render_service_client/unittest/jank_detector/BUILD.gn b/rosen/test/render_service/render_service_client/unittest/jank_detector/BUILD.gn index 3de7918c83..77b874dd15 100644 --- a/rosen/test/render_service/render_service_client/unittest/jank_detector/BUILD.gn +++ b/rosen/test/render_service/render_service_client/unittest/jank_detector/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") module_output_path = "graphic/rosen_engine/render_service_client/jank_detector" diff --git a/rosen/test/render_service/render_service_client/unittest/pipeline/BUILD.gn b/rosen/test/render_service/render_service_client/unittest/pipeline/BUILD.gn index d49dbabc2b..7459fd8350 100644 --- a/rosen/test/render_service/render_service_client/unittest/pipeline/BUILD.gn +++ b/rosen/test/render_service/render_service_client/unittest/pipeline/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") module_output_path = "graphic/rosen_engine/render_service_client/pipeline" diff --git a/rosen/test/render_service/render_service_client/unittest/transaction/BUILD.gn b/rosen/test/render_service/render_service_client/unittest/transaction/BUILD.gn index 503f7a689f..fd504d61f2 100644 --- a/rosen/test/render_service/render_service_client/unittest/transaction/BUILD.gn +++ b/rosen/test/render_service/render_service_client/unittest/transaction/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") module_output_path = "graphic/rosen_engine/render_service_client/transaction" diff --git a/rosen/test/render_service/render_service_client/unittest/ui/BUILD.gn b/rosen/test/render_service/render_service_client/unittest/ui/BUILD.gn index 02401afd3f..04338dae82 100755 --- a/rosen/test/render_service/render_service_client/unittest/ui/BUILD.gn +++ b/rosen/test/render_service/render_service_client/unittest/ui/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") module_output_path = "graphic/rosen_engine/render_service_client/ui" -- Gitee From cc2e059619af478d5bb0fe63aca5a9a26cb72b37 Mon Sep 17 00:00:00 2001 From: itihobaev Date: Thu, 18 Apr 2024 13:49:25 +0300 Subject: [PATCH 02/11] Fixed format_check issues Signed-off-by: itihobaev Change-Id: I970b7f33b2e23c754b29e1374b940fd75b630c52 --- ace_platforms.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ace_platforms.gni b/ace_platforms.gni index 970779208d..ee453436bf 100644 --- a/ace_platforms.gni +++ b/ace_platforms.gni @@ -11,14 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. - use_mingw_win = "${current_os}_${current_cpu}" == "mingw_x86_64" ace_root = "//foundation/arkui/ace_engine" graphic_2d_root = "//foundation/graphic/graphic_2d" ace_platforms = [] _ace_adapter_dir = rebase_path("$graphic_2d_root/adapter", root_build_dir) -_adapters = exec_script("$ace_root/build/search.py", [ _ace_adapter_dir ], "list lines") +_adapters = + exec_script("$ace_root/build/search.py", [ _ace_adapter_dir ], "list lines") foreach(item, _adapters) { import_var = { } -- Gitee From 0392a99b59b555b7b7af71597da071dd32fdda33 Mon Sep 17 00:00:00 2001 From: itihobaev Date: Thu, 18 Apr 2024 14:03:17 +0300 Subject: [PATCH 03/11] Fixed format check issue Signed-off-by: itihobaev Change-Id: Ib9f78483cd29d91b55215ae2ee58f86876bf3ddb --- interfaces/kits/napi/graphic/drawing/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/interfaces/kits/napi/graphic/drawing/BUILD.gn b/interfaces/kits/napi/graphic/drawing/BUILD.gn index 54a4d6856b..327bb1c410 100644 --- a/interfaces/kits/napi/graphic/drawing/BUILD.gn +++ b/interfaces/kits/napi/graphic/drawing/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") - group("drawingnapi") { deps = [ ":drawing_napi", -- Gitee From a28a385b6776c147cad453e81e372e90724e968c Mon Sep 17 00:00:00 2001 From: itihobaev Date: Thu, 18 Apr 2024 14:44:11 +0300 Subject: [PATCH 04/11] Fixed format check issue Signed-off-by: itihobaev Change-Id: I30d2d62e7c4ce93cd277c90fe9600bf1f791f397 --- rosen/modules/2d_engine/rosen_text/skia_txt/BUILD.gn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rosen/modules/2d_engine/rosen_text/skia_txt/BUILD.gn b/rosen/modules/2d_engine/rosen_text/skia_txt/BUILD.gn index 5438cda56c..f0a994985e 100644 --- a/rosen/modules/2d_engine/rosen_text/skia_txt/BUILD.gn +++ b/rosen/modules/2d_engine/rosen_text/skia_txt/BUILD.gn @@ -16,7 +16,6 @@ import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") import("$graphic_2d_root/rosen/modules/2d_engine/rosen_text/config.gni") - config("skia_libtxt_config") { include_dirs = [ "$graphic_2d_root/rosen/modules/2d_engine/rosen_text/export", @@ -261,8 +260,8 @@ ohos_source_set("skia_shaper") { defines += [ "SKSHAPER_IMPLEMENTATION=1" ] sources = [ "$skshaper_root/src/SkShaper.cpp", - "$skshaper_root/src/SkShaper_primitive.cpp", "$skshaper_root/src/SkShaper_harfbuzz.cpp", + "$skshaper_root/src/SkShaper_primitive.cpp", ] platform = current_os -- Gitee From 683f3388523e90ba1723c0febfce82b7f5e124f2 Mon Sep 17 00:00:00 2001 From: itihobaev Date: Thu, 18 Apr 2024 15:36:10 +0300 Subject: [PATCH 05/11] Fixed format check issue Signed-off-by: itihobaev Change-Id: I85b20afd401f7637250b6b5e01bd806c98173319 --- rosen/modules/2d_graphics/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosen/modules/2d_graphics/BUILD.gn b/rosen/modules/2d_graphics/BUILD.gn index 535b7ba0d2..41aed1e7b3 100755 --- a/rosen/modules/2d_graphics/BUILD.gn +++ b/rosen/modules/2d_graphics/BUILD.gn @@ -12,8 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/graphic/graphic_2d/graphic_config.gni") import("//foundation/graphic/graphic_2d/ace_platforms.gni") +import("//foundation/graphic/graphic_2d/graphic_config.gni") import("$graphic_2d_root/rosen/modules/2d_engine/rosen_text/config.gni") drawing_root = "$rosen_root/modules/2d_graphics" -- Gitee From 17cb44fb15a4b7a16fb61ef31a074f2e87a0f4a3 Mon Sep 17 00:00:00 2001 From: itihobaev Date: Fri, 19 Apr 2024 14:25:33 +0300 Subject: [PATCH 06/11] Added new variable to ace_platforms Signed-off-by: itihobaev Change-Id: Ieb5091a5f5cf596d27354a5fa53e07965abb5052 --- ace_platforms.gni | 1 + rosen/modules/render_service_base/src/platform/windows/BUILD.gn | 1 + 2 files changed, 2 insertions(+) diff --git a/ace_platforms.gni b/ace_platforms.gni index ee453436bf..647351f60d 100644 --- a/ace_platforms.gni +++ b/ace_platforms.gni @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +enable_glfw_window = false use_mingw_win = "${current_os}_${current_cpu}" == "mingw_x86_64" ace_root = "//foundation/arkui/ace_engine" graphic_2d_root = "//foundation/graphic/graphic_2d" diff --git a/rosen/modules/render_service_base/src/platform/windows/BUILD.gn b/rosen/modules/render_service_base/src/platform/windows/BUILD.gn index b37eb11a51..0ba34686cc 100644 --- a/rosen/modules/render_service_base/src/platform/windows/BUILD.gn +++ b/rosen/modules/render_service_base/src/platform/windows/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/graphic/graphic_2d/ace_platforms.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") import("../../../config.gni") -- Gitee From 7fb6933086cacdbe878a68fcff04c63d3ea7dbc5 Mon Sep 17 00:00:00 2001 From: itihobaev Date: Wed, 24 Apr 2024 11:41:35 +0300 Subject: [PATCH 07/11] Removed unused configs Signed-off-by: itihobaev Change-Id: Ie68a86c5762cb389daf898f9f364da178ed29c11 --- adapter/ohos/build/common.gni | 191 ----------------------- adapter/ohos/build/config.gni | 4 +- adapter/ohos/build/config_ng.gni | 4 +- adapter/preview/build/config_linux.gni | 4 +- adapter/preview/build/config_mac.gni | 4 +- adapter/preview/build/config_windows.gni | 6 +- adapter/preview/build/preview_common.gni | 117 -------------- 7 files changed, 7 insertions(+), 323 deletions(-) delete mode 100644 adapter/ohos/build/common.gni delete mode 100644 adapter/preview/build/preview_common.gni diff --git a/adapter/ohos/build/common.gni b/adapter/ohos/build/common.gni deleted file mode 100644 index 82a4dd3f72..0000000000 --- a/adapter/ohos/build/common.gni +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") -import("//build/ohos/ace/ace_args.gni") -import("//foundation/graphic/graphic_2d/graphic_config.gni") - -defines = [ - "OHOS_PLATFORM", - "OHOS_STANDARD_SYSTEM", -] - -js_engines = [] -ark_engine = { - engine_name = "ark" - engine_path = "jsi" - engine_defines = [ "USE_ARK_ENGINE" ] -} -js_engines += [ ark_engine ] - -if (ace_enable_gpu) { - disable_gpu = false -} else { - disable_gpu = true -} - -use_build_in_js_engine = true -use_external_icu = "shared" -ohos_standard_fontmgr = true -sk_use_hilog = true -rich_components_support = true -advance_components_support = false -remote_window_support = true -effect_component_support = true -xcomponent_components_support = true -pixel_map_support = true -js_pa_support = true -connect_server_support = true -hdc_register_support = true -pa_engine_path = "adapter/ohos/entrance/pa_engine" -enable_rosen_backend = true -if (defined(global_parts_info.distributeddatamgr_udmf) && - defined(global_parts_info.msdp_device_status)) { - enable_drag_framework = true -} else { - enable_drag_framework = false -} -if (defined(global_parts_info.inputmethod_imf)) { - enable_standard_input = true -} else { - enable_standard_input = false -} -build_container_scope_lib = true -multiple_window_support = true -enable_ability_component = true -video_components_support = true -video_support_jsstack = true -image_components_support = true -preview_support = false -if (defined(global_parts_info.distributeddatamgr_pasteboard)) { - enable_system_clipboard = true -} else { - enable_system_clipboard = false -} -enable_image_compression = true -if (defined(global_parts_info.graphic_graphic_3d)) { - model_component_support = true -} else { - model_component_support = false -} - -window_scene_support = true -dynamic_component_support = true -vsync_timeout_check = true - -if (defined(preview_support) && preview_support) { - defines += [ "PREVIEW" ] -} - -if (defined(image_components_support) && image_components_support) { - defines += [ "IMAGE_SUPPORTED" ] -} - -if (defined(video_components_support) && video_components_support) { - defines += [ "VIDEO_SUPPORTED" ] -} - -if (defined(video_support_jsstack) && video_support_jsstack) { - defines += [ "SUPPORT_JSSTACK" ] -} - -if (defined(is_experiment_build) && is_experiment_build) { - web_components_support = true -} - -if (defined(web_components_support) && web_components_support) { - defines += [ "WEB_SUPPORTED" ] -} - -if (defined(enable_ability_component) && enable_ability_component) { - defines += [ "ABILITY_COMPONENT_SUPPORTED" ] -} - -if (disable_gpu || enable_rosen_backend) { - defines += [ "GPU_DISABLED" ] -} - -if (disable_gpu) { - defines += [ "UPLOAD_GPU_DISABLED" ] -} - -if (remote_window_support) { - defines += [ "REMOTE_WINDOW_SUPPORTED" ] -} - -if (effect_component_support) { - defines += [ "EFFECT_COMPONENT_SUPPORTED" ] -} - -if (xcomponent_components_support) { - defines += [ "XCOMPONENT_SUPPORTED" ] -} - -if (pixel_map_support) { - defines += [ "PIXEL_MAP_SUPPORTED" ] -} - -if (enable_rosen_backend) { - defines += [ "ENABLE_ROSEN_BACKEND" ] -} - -if (enable_standard_input) { - defines += [ "ENABLE_STANDARD_INPUT" ] -} - -if (multiple_window_support) { - defines += [ "MULTIPLE_WINDOW_SUPPORTED" ] -} - -if (model_component_support) { - defines += [ "MODEL_COMPONENT_SUPPORTED" ] -} - -if (use_build_in_js_engine) { - defines += [ "HIDDEN_SYMBOL" ] -} - -if (window_scene_support) { - defines += [ "WINDOW_SCENE_SUPPORTED" ] -} - -if (enable_drag_framework) { - defines += [ "ENABLE_DRAG_FRAMEWORK" ] -} - -if (defined(global_parts_info.multimedia_media_library)) { - media_library_exists = true - defines += [ "MEDIA_LIBRARY_EXISTS" ] -} else { - media_library_exists = false -} - -if (defined(global_parts_info.hiviewdfx_hichecker)) { - hichecker_exists = true - defines += [ "HICHECKER_EXISTS" ] -} else { - hichecker_exists = false -} - -if (dynamic_component_support) { - defines += [ "DYNAMIC_COMPONENT_SUPPORT" ] -} - -if (vsync_timeout_check) { - defines += [ "VSYNC_TIMEOUT_CHECK" ] -} - -cflags_cc = [ - "-Wno-thread-safety-attributes", - "-Wno-thread-safety-analysis", -] diff --git a/adapter/ohos/build/config.gni b/adapter/ohos/build/config.gni index 5c664dc324..99d6c5e19b 100644 --- a/adapter/ohos/build/config.gni +++ b/adapter/ohos/build/config.gni @@ -11,12 +11,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("common.gni") +import("//build/ohos.gni") form_components_support = true plugin_components_support = true -defines += [ +defines = [ "FORM_SUPPORTED", "PLUGIN_COMPONENT_SUPPORTED", ] diff --git a/adapter/ohos/build/config_ng.gni b/adapter/ohos/build/config_ng.gni index c8b2090a75..260737bbf8 100644 --- a/adapter/ohos/build/config_ng.gni +++ b/adapter/ohos/build/config_ng.gni @@ -11,12 +11,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("common.gni") - form_components_support = false plugin_components_support = false -defines += [ "NG_BUILD" ] +defines = [ "NG_BUILD" ] platform_deps = [ "//foundation/arkui/ace_engine/adapter/ohos/entrance:ace_ohos_standard_entrance_ohos_ng", diff --git a/adapter/preview/build/config_linux.gni b/adapter/preview/build/config_linux.gni index 8393f4c6ea..26c6b16c56 100644 --- a/adapter/preview/build/config_linux.gni +++ b/adapter/preview/build/config_linux.gni @@ -11,10 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("preview_common.gni") - # linux platform defines and configs -defines += [ +defines = [ "LINUX_PLATFORM", "GPU_DISABLED", "SK_BUILD_FONT_MGR_FOR_PREVIEW_LINUX", diff --git a/adapter/preview/build/config_mac.gni b/adapter/preview/build/config_mac.gni index 5bdfafed3c..b1e968250f 100644 --- a/adapter/preview/build/config_mac.gni +++ b/adapter/preview/build/config_mac.gni @@ -11,10 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("preview_common.gni") - # windows platform defines and configs -defines += [ +defines = [ "MAC_PLATFORM", "SK_BUILD_FONT_MGR_FOR_PREVIEW_MAC", ] diff --git a/adapter/preview/build/config_windows.gni b/adapter/preview/build/config_windows.gni index 5aa8dbc455..3bd5356742 100644 --- a/adapter/preview/build/config_windows.gni +++ b/adapter/preview/build/config_windows.gni @@ -11,10 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("preview_common.gni") - # windows platform defines and configs -defines += [ +defines = [ "WINDOWS_PLATFORM", "_USE_MATH_DEFINES", "NOGDI", @@ -23,7 +21,7 @@ defines += [ "SK_BUILD_FONT_MGR_FOR_PREVIEW_WIN", ] -cflags_cc += [ +cflags_cc = [ "-DWINVER=0x0601", "-Wno-inconsistent-dllimport", "-Wno-macro-redefined", diff --git a/adapter/preview/build/preview_common.gni b/adapter/preview/build/preview_common.gni deleted file mode 100644 index d2d197d727..0000000000 --- a/adapter/preview/build/preview_common.gni +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -xcomponent_components_support = false -form_components_support = false -remote_window_support = false -effect_component_support = false -use_external_icu = "shared" -rich_components_support = true -ohos_standard_fontmgr = true -image_components_support = false -plugin_components_support = false -enable_ability_component = false -enable_system_clipboard = false -advance_components_support = false -connect_server_support = false -enable_rosen_backend = true -enable_standard_input = false -video_components_support = false -web_components_support = false -preview_support = true -model_component_support = false -window_scene_support = false -build_for_preview = true - -# js engine common configs -js_pa_support = false -use_build_in_js_engine = true - -ark_engine = { - engine_name = "ark" - engine_path = "jsi" - engine_defines = [ "USE_ARK_ENGINE" ] -} -js_engines = [ ark_engine ] - -platform_deps = [ - "//foundation/arkui/ace_engine/adapter/preview/entrance:preview_entrance_source", - "//foundation/arkui/ace_engine/adapter/preview/external:preview_external_source", - "//foundation/arkui/ace_engine/adapter/preview/inspector:preview_inspector_source", - "//foundation/arkui/ace_engine/adapter/preview/osal:preview_osal_source", -] - -cflags_cc = [ - "-std=c++17", - "-Wno-thread-safety-attributes", - "-Wno-thread-safety-analysis", - "-Wno-ignored-attributes", - "-Wno-unknown-pragmas", - "-g1", -] - -defines = [ "UNICODE" ] - -if (defined(web_components_support) && web_components_support) { - defines += [ "WEB_SUPPORTED" ] -} - -if (defined(video_components_support) && video_components_support) { - defines += [ "VIDEO_SUPPORTED" ] -} - -if (defined(xcomponent_components_support) && xcomponent_components_support) { - defines += [ "XCOMPONENT_SUPPORTED" ] -} - -if (defined(form_components_support) && form_components_support) { - defines += [ "FORM_SUPPORTED" ] -} - -if (defined(remote_window_support) && remote_window_support) { - defines += [ "REMOTE_WINDOW_SUPPORTED" ] -} - -if (defined(effect_component_support) && effect_component_support) { - defines += [ "EFFECT_COMPONENT_SUPPORTED" ] -} - -if (defined(image_components_support) && image_components_support) { - defines += [ "IMAGE_SUPPORTED" ] -} - -if (defined(plugin_components_support) && plugin_components_support) { - defines += [ "PLUGIN_COMPONENT_SUPPORTED" ] -} - -if (defined(enable_ability_component) && enable_ability_component) { - defines += [ "ABILITY_COMPONENT_SUPPORTED" ] -} - -if (defined(preview_support) && preview_support) { - defines += [ "PREVIEW" ] -} - -if (defined(model_component_support) && model_component_support) { - defines += [ "MODEL_COMPONENT_SUPPORTED" ] -} - -if (defined(enable_rosen_backend) && enable_rosen_backend) { - defines += [ "ENABLE_ROSEN_BACKEND" ] -} - -if (defined(window_scene_support) && window_scene_support) { - defines += [ "WINDOW_SCENE_SUPPORTED" ] -} - -libace_target = "//foundation/arkui/ace_engine/build:libace_compatible" -- Gitee From 4e42f5018da64fa092ffb693eeb655d852c88f4a Mon Sep 17 00:00:00 2001 From: itihobaev Date: Sat, 27 Apr 2024 14:36:13 +0300 Subject: [PATCH 08/11] Fixed compilation of rk Signed-off-by: itihobaev Change-Id: Ic9632f811688b1d36a5ef8a4d5d0f9f568a0efa2 --- adapter/ohos/build/config.gni | 1 + adapter/ohos/build/config_ng.gni | 1 + 2 files changed, 2 insertions(+) diff --git a/adapter/ohos/build/config.gni b/adapter/ohos/build/config.gni index 99d6c5e19b..af25dee540 100644 --- a/adapter/ohos/build/config.gni +++ b/adapter/ohos/build/config.gni @@ -15,6 +15,7 @@ import("//build/ohos.gni") form_components_support = true plugin_components_support = true +use_external_icu = "shared" defines = [ "FORM_SUPPORTED", diff --git a/adapter/ohos/build/config_ng.gni b/adapter/ohos/build/config_ng.gni index 260737bbf8..edfff65849 100644 --- a/adapter/ohos/build/config_ng.gni +++ b/adapter/ohos/build/config_ng.gni @@ -13,6 +13,7 @@ form_components_support = false plugin_components_support = false +use_external_icu = "shared" defines = [ "NG_BUILD" ] -- Gitee From 0ab6f123a8c006cced9531a45782f7de31973e82 Mon Sep 17 00:00:00 2001 From: itihobaev Date: Fri, 3 May 2024 12:23:10 +0300 Subject: [PATCH 09/11] Remove python script usage Signed-off-by: itihobaev Change-Id: I2a95ecc74cd4775616ea418f4e9f51a3b58909d9 --- ace_platforms.gni | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ace_platforms.gni b/ace_platforms.gni index 647351f60d..afeea0814c 100644 --- a/ace_platforms.gni +++ b/ace_platforms.gni @@ -17,9 +17,7 @@ ace_root = "//foundation/arkui/ace_engine" graphic_2d_root = "//foundation/graphic/graphic_2d" ace_platforms = [] -_ace_adapter_dir = rebase_path("$graphic_2d_root/adapter", root_build_dir) -_adapters = - exec_script("$ace_root/build/search.py", [ _ace_adapter_dir ], "list lines") +_adapters = [ "preview", "ohos" ] foreach(item, _adapters) { import_var = { } -- Gitee From 2094ca9f2f4340cadd8872693d42a90d61443e81 Mon Sep 17 00:00:00 2001 From: itihobaev Date: Fri, 3 May 2024 12:45:42 +0300 Subject: [PATCH 10/11] Fixed format check issue Signed-off-by: itihobaev Change-Id: Ib3a36d882709a28be17962e33f94e07a4a1d7bfb --- ace_platforms.gni | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ace_platforms.gni b/ace_platforms.gni index afeea0814c..9b8acaf9e9 100644 --- a/ace_platforms.gni +++ b/ace_platforms.gni @@ -17,7 +17,10 @@ ace_root = "//foundation/arkui/ace_engine" graphic_2d_root = "//foundation/graphic/graphic_2d" ace_platforms = [] -_adapters = [ "preview", "ohos" ] +_adapters = [ + "preview", + "ohos", +] foreach(item, _adapters) { import_var = { } -- Gitee From 76e3087bc65aefa1111a32d3310be61872f558c3 Mon Sep 17 00:00:00 2001 From: itihobaev Date: Mon, 6 May 2024 11:09:43 +0300 Subject: [PATCH 11/11] Corrected copyright Signed-off-by: itihobaev Change-Id: I39b7879790b8fe8c4d75fd5dc9e407e9d01867db --- adapter/ohos/build/platform.gni | 2 +- adapter/preview/build/config.gni | 2 +- adapter/preview/build/config_linux.gni | 2 +- adapter/preview/build/config_mac.gni | 2 +- adapter/preview/build/config_windows.gni | 2 +- adapter/preview/build/platform.gni | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/adapter/ohos/build/platform.gni b/adapter/ohos/build/platform.gni index fb01d7b631..d59003da1e 100644 --- a/adapter/ohos/build/platform.gni +++ b/adapter/ohos/build/platform.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021-2024 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/adapter/preview/build/config.gni b/adapter/preview/build/config.gni index 8467bc7b9f..f75f40f3eb 100644 --- a/adapter/preview/build/config.gni +++ b/adapter/preview/build/config.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. +# Copyright (c) 2024 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/adapter/preview/build/config_linux.gni b/adapter/preview/build/config_linux.gni index 26c6b16c56..55a61a34bb 100644 --- a/adapter/preview/build/config_linux.gni +++ b/adapter/preview/build/config_linux.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021-2024 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/adapter/preview/build/config_mac.gni b/adapter/preview/build/config_mac.gni index b1e968250f..6449d7ce75 100644 --- a/adapter/preview/build/config_mac.gni +++ b/adapter/preview/build/config_mac.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021-2024 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/adapter/preview/build/config_windows.gni b/adapter/preview/build/config_windows.gni index 3bd5356742..432358b1c0 100644 --- a/adapter/preview/build/config_windows.gni +++ b/adapter/preview/build/config_windows.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021-2024 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/adapter/preview/build/platform.gni b/adapter/preview/build/platform.gni index eb25f0049e..0b18db5e13 100644 --- a/adapter/preview/build/platform.gni +++ b/adapter/preview/build/platform.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. +# Copyright (c) 2024 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -- Gitee