Standardize the component info of runtime core

Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/I9BDEW
Tests: build target & UT & standalone build
Signed-off-by: chenlong <chenlong292@h-partners.com>
Change-Id: I9f86e1e4626f805d411dd875c3d9f8806aa8a743
This commit is contained in:
cllvly 2024-03-30 10:07:29 +08:00
parent e7596ff5c9
commit ccd03e8049
6 changed files with 32 additions and 20 deletions

View File

@ -21,11 +21,6 @@ config("arkfile_public_config") {
"$target_gen_dir/include",
]
include_dirs += [
"//third_party/zlib",
"//third_party/zlib/contrib/minizip",
]
defines = []
if (is_ohos && !is_standard_system) {
defines += [ "ENABLE_FULL_FILE_FIELDS" ]
@ -111,6 +106,11 @@ ohos_static_library("libarkfile_static") {
]
external_deps = [ sdk_libc_secshared_dep ]
if (!ark_standalone_build) {
public_external_deps = [ "zlib:libz" ]
} else {
external_deps += [ "zlib:libz" ]
}
part_name = "runtime_core"
subsystem_name = "arkcompiler"
@ -129,6 +129,11 @@ ohos_source_set("libarkfile_static_fuzz") {
]
external_deps = [ sdk_libc_secshared_dep ]
if (!ark_standalone_build) {
public_external_deps = [ "zlib:libz" ]
} else {
external_deps += [ "zlib:libz" ]
}
part_name = "runtime_core"
subsystem_name = "arkcompiler"
@ -182,6 +187,11 @@ ohos_source_set("libarkfile_frontend_set_static") {
]
external_deps = [ sdk_libc_secshared_dep ]
if (!ark_standalone_build) {
public_external_deps = [ "zlib:libz" ]
} else {
external_deps += [ "zlib:libz" ]
}
part_name = "runtime_core"
subsystem_name = "arkcompiler"

View File

@ -42,7 +42,10 @@ host_unittest_action("LibPandaFileTest") {
"//third_party/googletest:gmock_main",
]
external_deps = [ sdk_libc_secshared_dep ]
external_deps = [
"zlib:libz",
sdk_libc_secshared_dep,
]
cflags = [ "-DWITH_MOCK" ]
}

View File

@ -18,11 +18,6 @@ config("arkziparchive_config") {
"$ark_root/libziparchive",
"$ark_root/libpandabase",
]
include_dirs += [
"//third_party/zlib",
"//third_party/zlib/contrib/minizip",
]
}
ohos_source_set("libarkziparchive_static") {
@ -41,7 +36,7 @@ ohos_source_set("libarkziparchive_static") {
if (ark_standalone_build || is_arkui_x) {
external_deps += [ "zlib:libz" ]
} else {
external_deps += [ "zlib:shared_libz" ]
public_external_deps = [ "zlib:shared_libz" ]
}
part_name = "runtime_core"
@ -74,9 +69,10 @@ ohos_source_set("libarkziparchive_frontend_set_static") {
deps = [ "$ark_root/libpandabase:libarkbase_frontend_static" ]
external_deps = [ sdk_libc_secshared_dep ]
external_deps += [ "zlib:libz" ]
external_deps = [
"zlib:libz",
sdk_libc_secshared_dep,
]
part_name = "runtime_core"
subsystem_name = "arkcompiler"

View File

@ -33,7 +33,10 @@ host_unittest_action("LibZipArchiveTest") {
"$ark_root/libziparchive:libarkziparchive_static",
]
external_deps = [ sdk_libc_secshared_dep ]
external_deps = [
"zlib:libz",
sdk_libc_secshared_dep,
]
}
group("unittest") {

View File

@ -17,8 +17,8 @@
#define LIBZIPARCHIVE_ZIP_ARCHIVE_H
#include <cstdint>
#include "unzip.h"
#include "zip.h"
#include <contrib/minizip/unzip.h>
#include <contrib/minizip/zip.h>
namespace panda {

View File

@ -33,8 +33,8 @@ ohos_executable("ark_verifier") {
sources = arkverifier_sources
deps = [ "$ark_root/libpandafile:libarkfile_static_verifier" ]
external_deps = [ "zlib:libz" ]
external_deps = []
if (enable_hilog) {
external_deps += [ "hilog:libhilog" ]
}
@ -57,7 +57,7 @@ ohos_shared_library("libarkverifier") {
sources = libarkverifier_sources
deps = [ "$ark_root/libpandafile:libarkfile_static_verifier" ]
external_deps = []
external_deps = [ "zlib:libz" ]
if (enable_hilog) {
external_deps += [ "hilog:libhilog" ]
}