diff --git a/bes2600/liteos_m/components/ui/BUILD.gn b/bes2600/liteos_m/components/ui/BUILD.gn index a651077..aecee0d 100755 --- a/bes2600/liteos_m/components/ui/BUILD.gn +++ b/bes2600/liteos_m/components/ui/BUILD.gn @@ -33,7 +33,6 @@ hdf_driver("ui_adapter") { public_deps = [ "//foundation/arkui/ui_lite:ui" ] if (bes_ace_enable) { defines = [ "ENABLE_ACE" ] - public_deps += [ "//foundation/arkui/ace_engine_lite/frameworks:ace_lite" ] } include_dirs = [ @@ -41,5 +40,7 @@ hdf_driver("ui_adapter") { "//drivers/peripheral/base", "//foundation/arkui/ui_lite/frameworks", "//third_party/freetype/include", + "//foundation/arkui/ace_engine_lite/frameworks/include/base/", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/jsi", ] } diff --git a/bes2600/liteos_m/sdk/bsp/rtos/liteos/liteos_m/Makefile b/bes2600/liteos_m/sdk/bsp/rtos/liteos/liteos_m/Makefile index 49a90d2..8a3f5ae 100644 --- a/bes2600/liteos_m/sdk/bsp/rtos/liteos/liteos_m/Makefile +++ b/bes2600/liteos_m/sdk/bsp/rtos/liteos/liteos_m/Makefile @@ -64,6 +64,7 @@ INC_DIR += -I$(EXTERN_ROOT_PATH)kernel/liteos_m/arch/arm/cortex-m33/gcc/NTZ/ INC_DIR += -I$(EXTERN_ROOT_PATH)third_party/bounds_checking_function/include/ INC_DIR += -I$(EXTERN_ROOT_PATH)kernel/liteos_m/components/exchook/ INC_DIR += -I$(EXTERN_ROOT_PATH)kernel/liteos_m/components/backtrace/ +INC_DIR += -I$(EXTERN_ROOT_PATH)kernel/liteos_m/arch/arm/common/ ccflags-y += $(INC_DIR) else INC_DIR = kernel/include diff --git a/hals/mbedtls/BUILD.gn b/hals/mbedtls/BUILD.gn index f8e295b..067610a 100755 --- a/hals/mbedtls/BUILD.gn +++ b/hals/mbedtls/BUILD.gn @@ -25,20 +25,7 @@ config("mbedtls_config") { ] } -lite_library("mbedtls_static") { - target_type = "static_library" - public_configs = [ ":mbedtls_config" ] - sources = MBEDTLS_SOURCES - [ "$MBEDTLSDIR/library/entropy_poll.c" ] + - [ "library/entropy_poll.c" ] + [ "$MBEDTLSDIR/library/debug.c" ] -} - group("mbedtls") { - public_deps = [ ":mbedtls_static" ] public_configs = [ ":mbedtls_config" ] } -ndk_lib("mbedtls_ndk") { - lib_extension = ".a" - deps = [ ":mbedtls" ] - head_files = [ "include" ] -}