Adaptive arkui-x cross platform build

Signed-off-by: lijunru <lijunru9@huawei.com>
This commit is contained in:
lijunru 2023-04-13 09:25:04 +08:00
parent 06898c5bc0
commit 5dd38ce64c
105 changed files with 147 additions and 137 deletions

View File

@ -24,7 +24,7 @@ config("ace_config") {
"//third_party/zlib",
]
if (is_standard_system && !use_mingw_win && !use_mac && !use_linux) {
if (is_ohos_standard_system && !use_mingw_win && !use_mac && !use_linux) {
include_dirs += [
"//base/global/resource_management/frameworks/resmgr/include",
"//base/global/resource_management/interfaces/inner_api/include",
@ -76,7 +76,7 @@ config("ace_test_config") {
cflags_cc = []
defines = ace_common_defines
if (is_standard_system && !use_mingw_win && !use_mac && !use_linux) {
if (is_ohos_standard_system && !use_mingw_win && !use_mac && !use_linux) {
include_dirs += [
"//base/global/resource_management/frameworks/resmgr/include",
"//base/global/resource_management/interfaces/inner_api/include",
@ -90,7 +90,7 @@ config("ace_test_config") {
defines += [ "OHOS_STANDARD_SYSTEM" ]
}
if (!is_standard_system) {
if (!is_ohos_standard_system) {
defines += [ "ENABLE_NATIVE_VIEW" ]
}

View File

@ -49,6 +49,7 @@ declare_args() {
}
enable_dump_drawcmd = false
is_ohos_standard_system = is_standard_system && !build_cross_platform_version
use_mingw_win = "${current_os}_${current_cpu}" == "mingw_x86_64"
use_mac = "${current_os}_${current_cpu}" == "mac_x64" ||
"${current_os}_${current_cpu}" == "mac_arm64"
@ -101,7 +102,7 @@ if ("${current_os}_${current_cpu}" == "mac_arm64") {
objcopy_clang = "$clang_base_path/bin/llvm-objcopy"
if (is_standard_system) {
if (is_ohos_standard_system) {
objcopy_default = "//prebuilts/clang/ohos/linux-x86_64/llvm/bin/llvm-objcopy"
node_js_path =
"//prebuilts/build-tools/common/nodejs/node-v12.18.4-linux-x64/bin/"
@ -117,7 +118,7 @@ if (is_standard_system) {
ace_engine_subsystem = "arkui"
# Config part name
if (is_standard_system) {
if (is_ohos_standard_system) {
ace_engine_part = "ace_engine"
hilog_deps = [ "hiviewdfx_hilog_native:libhilog" ]
ark_runtime_path = "//arkcompiler/runtime_core"
@ -132,7 +133,7 @@ if (is_standard_system) {
}
# Config test output path
if (is_standard_system) {
if (is_ohos_standard_system) {
test_output_path = "ace_engine/backenduiFrameNode"
} else {
test_output_path = "ace_engine_full/backenduiFrameNode"

View File

@ -15,7 +15,8 @@ import("//build/ohos.gni")
platforms = []
if (is_standard_system) {
is_ohos_standard_system = is_standard_system && !build_cross_platform_version
if (is_ohos_standard_system) {
ohos_platform = {
name = "ohos"
config = {

View File

@ -27,7 +27,7 @@ template("ace_osal_ohos_source_set") {
vendor_configs.use_ext_surface) {
defines += [ "EXT_SURFACE_ENABLE" ]
}
if (is_standard_system) {
if (is_ohos_standard_system) {
external_deps = [
"hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog",
@ -68,7 +68,7 @@ template("ace_osal_ohos_source_set") {
public_deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ]
if (is_standard_system) {
if (is_ohos_standard_system) {
sources += [
"resource_adapter_impl.cpp",
"resource_convertor.cpp",

View File

@ -13,8 +13,9 @@
import("//build/test.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/graphicalbasicability/uiservice"
} else {
module_output_path = "ace_engine_full/graphicalbasicability/uiservice"

View File

@ -13,8 +13,9 @@
import("//build/test.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/graphicalbasicability/uiservice"
} else {
module_output_path = "ace_engine_full/graphicalbasicability/uiservice"

View File

@ -71,7 +71,7 @@ foreach(device, ace_devices) {
}
}
if (is_standard_system) {
if (is_ohos_standard_system) {
# All dynamic libraries to be copied to the path "/previewer/common/bin/module/",
# which are called by the napi framework, can be added to this script.
foreach(module, napi_modules) {

View File

@ -94,7 +94,7 @@ ohos_source_set("preview_osal_source") {
include_dirs = [ "//commonlibrary/c_utils/base/include" ]
if (is_standard_system) {
if (is_ohos_standard_system) {
sources += [
"${ace_root}/adapter/ohos/osal/resource_theme_style.cpp",
"frame_trace_adapter_impl.cpp",

View File

@ -12,10 +12,11 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import("//foundation/arkui/ace_engine/build/ace_lib.gni")
import("//foundation/arkui/ace_engine/interfaces/napi/kits/napi_lib.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
system_resource_hap_path =
get_label_info("//base/global/system_resources/systemres:systemres_hap",
"target_out_dir") + "/SystemResources.hap"
@ -43,7 +44,7 @@ action("get_system_resource") {
}
# Triggered only when the SDK is compiled
if (is_standard_system) {
if (is_ohos_standard_system) {
import("sharedlib_config.gni")
foreach(module, napi_modules) {

View File

@ -104,7 +104,7 @@ foreach(item, ace_platforms) {
"$ace_root/frameworks/core/components/test/unittest/mock/subwindow_mock.cpp",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
sources -= [
"$ace_root/frameworks/base/test/mock/mock_download_manager.cpp",
"$ace_root/frameworks/core/components/test/mock/mock_resource_adapter.cpp",

View File

@ -48,7 +48,7 @@ group("unittest") {
"unittest/jsfrontend/utils:unittest",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
deps += [ "unittest/jsfrontend/codec:unittest" ]
}

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/jsframework/source_map"
} else {
module_output_path = "ace_engine_full/jsframework/source_map"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/jsframework/transform_convertor"
} else {
module_output_path = "ace_engine_full/jsframework/transform_convertor"

View File

@ -403,7 +403,7 @@ template("ace_core_source_set") {
}
if (!use_mingw_win && !use_mac && !is_wearable_product &&
!is_standard_system && !use_linux) {
!is_ohos_standard_system && !use_linux) {
deps += [ "$ace_root/frameworks/core/components/rich_text:ace_core_components_rich_text_$platform" ]
}

View File

@ -214,7 +214,7 @@ ohos_unittest("AnimationTest") {
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",

View File

@ -218,12 +218,12 @@ ohos_unittest("SpringChainTest") {
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",
]
aosp_deps = [ "shared_library:libcurl" ]
libs = [ "curl" ]
} else {
configs += [ "//third_party/curl:curl_config" ]
deps += [ "//third_party/curl:curl" ]

View File

@ -218,7 +218,7 @@ ohos_unittest("SvgAnimateTest") {
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components/components.gni")
@ -38,7 +39,7 @@ build_component("camera") {
"camera_element.cpp",
]
if (is_standard_system && !use_mingw_win && !use_mac && !use_linux) {
if (is_ohos_standard_system && !use_mingw_win && !use_mac && !use_linux) {
configs = [ ":standard_camera_config" ]
sources += [ "standard_system/camera.cpp" ]

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/align"
} else {
module_output_path = "ace_engine_full/backenduicomponent/align"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/color"
} else {
module_output_path = "ace_engine_full/backenduicomponent/color"

View File

@ -67,11 +67,6 @@ template("build_component") {
public_configs += invoker.public_configs
}
if (defined(invoker.aosp_deps)) {
aosp_deps = []
aosp_deps += invoker.aosp_deps
}
if (defined(invoker.external_deps)) {
external_deps = []
external_deps += invoker.external_deps
@ -111,7 +106,7 @@ template("build_component") {
}
if (defined(config.web_components_support) &&
config.web_components_support && is_standard_system) {
config.web_components_support && is_ohos_standard_system) {
if (defined(invoker.standard_web_configs)) {
configs += invoker.standard_web_configs
}

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components/components.gni")
@ -27,7 +28,7 @@ build_component("form") {
"sub_container.cpp",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
external_deps = [
"ability_base:want",
"ability_runtime:app_manager",

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components/components.gni")
@ -31,7 +32,7 @@ build_component("plugin") {
]
rosen_sources = [ "rosen_render_plugin.cpp" ]
if (is_standard_system && !use_mingw_win && !use_mac && !use_linux) {
if (is_ohos_standard_system && !use_mingw_win && !use_mac && !use_linux) {
include_dirs = [
"//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager/include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components/components.gni")
@ -23,7 +24,7 @@ build_component("remote_window") {
]
rosen_sources = [ "rosen_render_remote_window.cpp" ]
if (is_standard_system && !use_mingw_win && !use_mac && !use_linux) {
if (is_ohos_standard_system && !use_mingw_win && !use_mac && !use_linux) {
include_dirs = [
"//drivers/peripheral/display/interfaces/include",
"//foundation/multimedia/player_framework/interfaces/inner_api/native",

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/align"
} else {
module_output_path = "ace_engine_full/backenduicomponent/align"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/border"
} else {
module_output_path = "ace_engine_full/backenduicomponent/border"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/box"
} else {
module_output_path = "ace_engine_full/backenduicomponent/box"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/button"
} else {
module_output_path = "ace_engine_full/backenduicomponent/button"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/camera"
} else {
module_output_path = "ace_engine_full/backenduicomponent/camera"

View File

@ -253,7 +253,7 @@ ohos_unittest("CheckableComponentTest") {
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",

View File

@ -192,7 +192,7 @@ ohos_unittest("ClockComponentTest") {
]
external_deps = [ "c_utils:utils" ]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps += [
"hilog:libhilog",
"resmgr:resourcemanager",
@ -215,7 +215,7 @@ group("unittest") {
testonly = true
deps = []
if (!is_standard_system) {
if (!is_ohos_standard_system) {
deps = [ ":ClockComponentTest" ]
}
}

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/decoration"
} else {
module_output_path = "ace_engine_full/backenduicomponent/decoration"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/dialogandpopup"
} else {
module_output_path = "ace_engine_full/backenduicomponent/dialogandpopup"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/display"
} else {
module_output_path = "ace_engine_full/backenduicomponent/display"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/divider"
} else {
module_output_path = "ace_engine_full/backenduicomponent/divider"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/drag_bar"
} else {
module_output_path = "ace_engine_full/backenduicomponent/drag_bar"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/graphicalbasicability/gesture"
} else {
module_output_path = "ace_engine_full/graphicalbasicability/gesture"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/grid"
} else {
module_output_path = "ace_engine_full/backenduicomponent/grid"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/gridlayout"
} else {
module_output_path = "ace_engine_full/backenduicomponent/gridlayout"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/graphicalbasicability/image"
} else {
module_output_path = "ace_engine_full/graphicalbasicability/image"
@ -199,7 +199,7 @@ ohos_unittest("RenderImageTest") {
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",

View File

@ -227,7 +227,7 @@ ohos_unittest("ImageAnimatorElementTest") {
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/indexer"
} else {
module_output_path = "ace_engine_full/backenduicomponent/indexer"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/list"
} else {
module_output_path = "ace_engine_full/backenduicomponent/list"

View File

@ -237,7 +237,7 @@ ohos_unittest("RenderMarqueeTest") {
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/menu"
} else {
module_output_path = "ace_engine_full/backenduicomponent/menu"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/padding"
} else {
module_output_path = "ace_engine_full/backenduicomponent/padding"

View File

@ -13,7 +13,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/pattern_lock"
} else {
module_output_path = "ace_engine_full/backenduicomponent/pattern_lock"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/picker"
} else {
module_output_path = "ace_engine_full/backenduicomponent/picker"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/piece"
} else {
module_output_path = "ace_engine_full/backenduicomponent/piece"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/plugin"
} else {
module_output_path = "ace_engine_full/backenduicomponent/plugin"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/progress"
} else {
module_output_path = "ace_engine_full/backenduicomponent/progress"

View File

@ -46,7 +46,7 @@ ohos_unittest("RatingComponentTest") {
"$ace_root/frameworks/core/components/common/properties/color.cpp",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
sources += []
} else {
sources += [ "$ace_root/frameworks/core/components/test/mock/mock_resource_adapter.cpp" ]
@ -79,7 +79,7 @@ ohos_unittest("RatingComponentTest") {
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/refresh"
} else {
module_output_path = "ace_engine_full/backenduicomponent/refresh"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/relative_container"
} else {
module_output_path = "ace_engine_full/backenduicomponent/relative_container"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/rotation"
} else {
module_output_path = "ace_engine_full/backenduicomponent/rotation"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/scroll"
} else {
module_output_path = "ace_engine_full/backenduicomponent/scroll"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/select"
} else {
module_output_path = "ace_engine_full/backenduicomponent/select"

View File

@ -232,7 +232,7 @@ ohos_unittest("RenderSemiModalTest") {
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/shadow"
} else {
module_output_path = "ace_engine_full/backenduicomponent/shadow"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/slider"
} else {
module_output_path = "ace_engine_full/backenduicomponent/slider"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/sliding_panel"
} else {
module_output_path = "ace_engine_full/backenduicomponent/sliding_panel"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/stack"
} else {
module_output_path = "ace_engine_full/backenduicomponent/stack"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/frameworkbasicability/stage"
} else {
module_output_path = "ace_engine_full/frameworkbasicability/stage"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/stepper"
} else {
module_output_path = "ace_engine_full/backenduicomponent/stepper"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/svg"
} else {
module_output_path = "ace_engine_full/backenduicomponent/svg"

View File

@ -241,7 +241,7 @@ ohos_unittest("SwiperComponentTest") {
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/tabbar"
} else {
module_output_path = "ace_engine_full/backenduicomponent/tabbar"
@ -45,7 +45,7 @@ ohos_unittest("RenderTabContentTest") {
"$ace_root/frameworks/core/components/common/properties/color.cpp",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
sources += []
} else {
sources += [ "$ace_root/frameworks/core/components/test/mock/mock_resource_adapter.cpp" ]
@ -77,7 +77,7 @@ ohos_unittest("RenderTabContentTest") {
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
deps += [ "$ace_root/frameworks/base:ace_base_ohos" ]
external_deps = [
"hilog:libhilog",

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/text"
} else {
module_output_path = "ace_engine_full/backenduicomponent/text"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/textfield"
} else {
module_output_path = "ace_engine_full/backenduicomponent/textfield"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/theme"
} else {
module_output_path = "ace_engine_full/backenduicomponent/theme"
@ -94,7 +94,7 @@ ohos_unittest("ThemeManagerTest") {
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
sources += [
"$ace_root/frameworks/bridge/common/dom/dom_type.cpp",
"$ace_root/frameworks/bridge/common/utils/utils.cpp",
@ -204,7 +204,7 @@ ohos_unittest("ThemeConstantsTest") {
"//third_party/googletest:gtest_main",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
external_deps = [
"hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog",

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/toggle"
} else {
module_output_path = "ace_engine_full/backenduicomponent/toggle"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/transform"
} else {
module_output_path = "ace_engine_full/backenduicomponent/transform"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/frameworkbasicability/transition"
} else {
module_output_path = "ace_engine_full/frameworkbasicability/transition"
@ -235,7 +235,7 @@ ohos_unittest("TransitionElementTest") {
"//third_party/zlib:libz",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
external_deps = [
"eventhandler:libeventhandler",
"hitrace_native:hitrace_meter",
@ -292,7 +292,7 @@ ohos_unittest("SharedTransitionElementTest") {
"//third_party/zlib:libz",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
external_deps = [
"eventhandler:libeventhandler",
"hitrace_native:hitrace_meter",
@ -350,7 +350,7 @@ ohos_unittest("TransitionPropertyElementTest") {
"//third_party/zlib:libz",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
external_deps = [
"eventhandler:libeventhandler",
"hitrace_native:hitrace_meter",

View File

@ -217,7 +217,7 @@ ohos_unittest("TweenElementTest") {
"//third_party/googletest:gtest_main",
]
if (!is_standard_system) {
if (!is_ohos_standard_system) {
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/video"
} else {
module_output_path = "ace_engine_full/backenduicomponent/video"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/graphicalbasicability/viewupdate"
} else {
module_output_path = "ace_engine_full/graphicalbasicability/viewupdate"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/water_flow"
} else {
module_output_path = "ace_engine_full/backenduicomponent/water_flow"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/web"
} else {
module_output_path = "ace_engine_full/backenduicomponent/web"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/backenduicomponent/wrap"
} else {
module_output_path = "ace_engine_full/backenduicomponent/wrap"

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components/components.gni")
@ -48,7 +49,7 @@ build_component("text_overlay_for_web") {
"text_overlay_manager.cpp",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
deps = [
"//foundation/graphic/graphic_2d:libsurface",
"//third_party/EGL:libEGL",

View File

@ -11,10 +11,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components/components.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
config("ohos_web_config") {
include_dirs = [
"$ability_runtime_path/interfaces/kits/native/appkit/app",
@ -40,13 +41,13 @@ build_component("web") {
"web_element.cpp",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
sources += [ "resource/web_javascript_result_callback.cpp" ]
}
rosen_sources = [ "rosen_render_web.cpp" ]
if (is_standard_system) {
if (is_ohos_standard_system) {
configs = [ ":ohos_web_config" ]
deps = [
"$ability_runtime_path/frameworks/native/appkit:appkit_native",

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components/components.gni")
@ -29,7 +30,7 @@ build_component("xcomponent") {
rosen_sources = [ "rosen_render_xcomponent.cpp" ]
if (is_standard_system && !use_mingw_win && !use_mac && !use_linux) {
if (is_ohos_standard_system && !use_mingw_win && !use_mac && !use_linux) {
include_dirs = [
"//drivers/peripheral/display/interfaces/include",
"//foundation/graphic/graphic_2d/interfaces/innerkits/wmclient",

View File

@ -78,11 +78,6 @@ template("build_component_ng") {
public_configs += invoker.public_configs
}
if (defined(invoker.aosp_deps)) {
aosp_deps = []
aosp_deps += invoker.aosp_deps
}
if (defined(invoker.external_deps)) {
external_deps = []
external_deps += invoker.external_deps

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import("//foundation/arkui/ace_engine/build/ace_ext.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
@ -446,7 +447,7 @@ build_component_ng("pattern_model_component_ng") {
"model/model_view_ng.cpp",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
deps = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client" ]
}
}

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
@ -21,7 +22,7 @@ build_component_ng("form_pattern_ng") {
"form_view.cpp",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
deps = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client" ]
external_deps = [
"ability_base:want",

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
@ -21,7 +22,7 @@ build_component_ng("plugin_pattern_ng") {
"plugin_pattern.cpp",
]
if (is_standard_system && !use_mingw_win && !use_mac && !use_linux) {
if (is_ohos_standard_system && !use_mingw_win && !use_mac && !use_linux) {
deps = [
"//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
@ -21,7 +22,7 @@ build_component_ng("remote_window_pattern_ng") {
"remote_window_view.cpp",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
deps = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client" ]
}
}

View File

@ -11,10 +11,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
config("ohos_web_config") {
include_dirs = [
"$ability_runtime_path/interfaces/kits/native/appkit/app",
@ -35,7 +36,7 @@ build_component_ng("web_pattern_ng") {
"web_view.cpp",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
configs = [ ":ohos_web_config" ]
configs += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:render_service_client_config" ]
deps = [

View File

@ -14,7 +14,7 @@
import("//foundation/arkui/ace_engine/ace_config.gni")
import("$ace_root/frameworks/core/components_ng/components.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
config("ohos_window_scene_config") {
include_dirs = [
"$window_manager_path/interfaces/innerkits",
@ -31,7 +31,7 @@ build_component_ng("window_scene") {
"scene/host/host_window_pattern.cpp",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
configs = [ ":ohos_window_scene_config" ]
deps = [

View File

@ -12,6 +12,7 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("form_pattern_test_ng") {
@ -48,7 +49,7 @@ ohos_unittest("form_pattern_test_ng") {
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
external_deps = [
"ability_base:want",
"ability_runtime:app_manager",

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components/components.gni")
@ -23,7 +24,7 @@ build_component("ability_v2") {
rosen_sources = [ "rosen_render_ability_component.cpp" ]
if (is_standard_system && !use_mingw_win && !use_mac) {
if (is_ohos_standard_system && !use_mingw_win && !use_mac) {
deps = [ "//foundation/graphic/graphic_2d:libsurface" ]
}
}

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/graphicalbasicability/event"
} else {
module_output_path = "ace_engine_full/graphicalbasicability/event"

View File

@ -81,7 +81,7 @@ ohos_unittest("FocusTest") {
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
deps += [ "$ace_flutter_engine_root/icu:ace_libicu_ohos" ]
} else {

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/graphicalbasicability/gestures"
} else {
module_output_path = "ace_engine_full/graphicalbasicability/gestures"

View File

@ -14,7 +14,7 @@
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/graphicalbasicability/image"
} else {
module_output_path = "ace_engine_full/graphicalbasicability/image"

View File

@ -15,7 +15,7 @@ import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import("../../../../../build/uicast.gni")
if (is_standard_system) {
if (is_ohos_standard_system) {
module_output_path = "ace_engine/graphicalbasicability/pipeline"
} else {
module_output_path = "ace_engine_full/graphicalbasicability/pipeline"
@ -249,8 +249,8 @@ ohos_unittest("PipelineContextTest") {
include_dirs += uicast_configs.uicast_root_include
if (!is_standard_system) {
aosp_deps = [ "shared_library:libcurl" ]
if (!is_ohos_standard_system) {
libs = [ "curl" ]
external_deps = [
"hilog:libhilog",
"resmgr:resourcemanager",

View File

@ -52,7 +52,7 @@ ohos_shared_library("ace_ndk") {
get_label_info(":libace_ndk", "name") + version_script_suffix
} else if (target_os == "android") {
sources += [ "$ace_root/adapter/android/osal/log_wrapper.cpp" ]
aosp_deps = [ "shared_library:liblog" ]
libs = [ "log" ]
}
subsystem_name = ace_engine_subsystem

View File

@ -106,7 +106,7 @@ ohos_fuzztest("AceResKeyParserFuzzTest") {
"$ace_root:ace_test_config",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
external_deps = [
"hiviewdfx_hilog_native:libhilog",
"init:libbegetutil",

View File

@ -52,7 +52,7 @@ ohos_fuzztest("ArkResschedFuzzTest") {
defines = [ "FUZZTEST" ]
if (is_standard_system) {
if (is_ohos_standard_system) {
external_deps = [
"hiviewdfx_hilog_native:libhilog",
"init:libbegetutil",

View File

@ -134,7 +134,7 @@ ohos_fuzztest("ImageApiFuzzTest") {
"$ace_root:ace_test_config",
]
if (is_standard_system) {
if (is_ohos_standard_system) {
external_deps = [
"hiviewdfx_hilog_native:libhilog",
"init:libbegetutil",

Some files were not shown because too many files have changed in this diff Show More