From 6fd8bf566c3d7be4d93441b9db48ce884f4bff82 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Sep 2021 23:41:15 +0800 Subject: [PATCH 1/4] modified build.gn Signed-off-by: cc@neusoft.com --- BUILD.gn | 1 + frameworks/innerkitsimpl/test/BUILD.gn | 13 +- frameworks/innerkitsimpl/utils/BUILD.gn | 2 +- interfaces/innerkits/BUILD.gn | 115 +++++++++++++++--- interfaces/kits/native/test/BUILD.gn | 2 +- .../common/libs/image/libjpegplugin/BUILD.gn | 2 +- 6 files changed, 110 insertions(+), 25 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 733549aa0..58107d321 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,6 +16,7 @@ import("//build/ohos.gni") group("image_framework") { deps = [ "frameworks/innerkitsimpl/utils:image_utils", + "interfaces/innerkits:image_native", "interfaces/innerkits:image", ] } diff --git a/frameworks/innerkitsimpl/test/BUILD.gn b/frameworks/innerkitsimpl/test/BUILD.gn index 4c1ceac59..826809b7e 100644 --- a/frameworks/innerkitsimpl/test/BUILD.gn +++ b/frameworks/innerkitsimpl/test/BUILD.gn @@ -29,9 +29,8 @@ ohos_unittest("imagepixelmaptest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_pixel_map_test.cpp" ] deps = [ - # "//foundation/multimedia/image_standard/adapter/frameworks/bitmapconverter/native:bitmapconverter", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", +# "//foundation/multimedia/image_standard/adapter/frameworks/bitmapconverter/native:bitmapconverter", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -102,7 +101,7 @@ ohos_unittest("imagesourcetest") { deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -127,8 +126,7 @@ ohos_unittest("colorconvertertest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/color_converter_test.cpp" ] deps = [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -153,8 +151,7 @@ ohos_unittest("transformtest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_transform_test.cpp" ] deps = [ - "//base/hiviewdfx/hilog/frameworks/native:libhilogutil", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/innerkitsimpl/utils/BUILD.gn b/frameworks/innerkitsimpl/utils/BUILD.gn index 0e14b2bdf..e0fc358d7 100644 --- a/frameworks/innerkitsimpl/utils/BUILD.gn +++ b/frameworks/innerkitsimpl/utils/BUILD.gn @@ -64,7 +64,7 @@ ohos_shared_library("image_utils") { "hiviewdfx_hilog_native:libhilog", ] } - relative_install_dir = "module/multimedia" + #relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "multimedia_image_standard" } diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 5771cdf70..b1bf81329 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -33,8 +33,7 @@ config("image_external_config") { ] if (use_mingw_win) { - include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + include_dirs += [ "//foundation/multimedia/image_standard/mock/native/include" ] } else if (use_clang_mac) { include_dirs += [ "//foundation/multimedia/image_standard/mock/native/include", @@ -53,19 +52,22 @@ config("image_external_config") { js_declaration("image_js") { part_name = "multimedia_image_standard" - sources = [ "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts" ] + sources = [ + "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts", + ] } ohos_copy("image_declaration") { - sources = [ "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts" ] + sources = [ + "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts", + ] outputs = [ target_out_dir + "/$target_name/" ] module_source_dir = target_out_dir + "/$target_name" module_install_name = "" } -ohos_shared_library("image") { +ohos_shared_library("image"){ public_configs = [ ":image_external_config" ] - sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", @@ -85,11 +87,59 @@ ohos_shared_library("image") { "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", - + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", + + ] + deps = [ + "//foundation/ace/napi:ace_napi", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//utils/native/base:utils", + ] + + external_deps = [ + "bytrace_standard:bytrace_core", + "ipc:ipc_core", + "hiviewdfx_hilog_native:libhilog", + + ] + relative_install_dir = "module/multimedia" + subsystem_name = "multimedia" + part_name = "multimedia_image_standard" +} + + + +ohos_shared_library("image_native") { + public_configs = [ ":image_external_config" ] + + sources = [ + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_source.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map_parcel.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/matrix.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/post_proc.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/scan_line_filter.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", ] if (use_mingw_win) { @@ -143,17 +193,17 @@ ohos_shared_library("image") { ] } external_deps = [ - "bytrace_standard:bytrace_core", - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", + "bytrace_standard:bytrace_core", + "ipc:ipc_core", + "hiviewdfx_hilog_native:libhilog", + ] } - relative_install_dir = "module/multimedia" +# relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "multimedia_image_standard" } - -ohos_static_library("image_static") { +ohos_static_library("image_static_napi"){ public_configs = [ ":image_external_config" ] sources = [ @@ -162,6 +212,7 @@ ohos_static_library("image_static") { "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_source.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map_parcel.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/matrix.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", @@ -174,11 +225,47 @@ ohos_static_library("image_static") { "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", - + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", + ] + deps = [ + "//foundation/ace/napi:ace_napi", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//utils/native/base:utils", + ] + subsystem_name = "multimedia" + part_name = "multimedia_image_standard" +} + +ohos_static_library("image_static") { + public_configs = [ ":image_external_config" ] + + sources = [ + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_source.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/matrix.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/post_proc.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/scan_line_filter.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", ] if (use_mingw_win) { diff --git a/interfaces/kits/native/test/BUILD.gn b/interfaces/kits/native/test/BUILD.gn index 803592a7f..44d70663f 100644 --- a/interfaces/kits/native/test/BUILD.gn +++ b/interfaces/kits/native/test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("pixlmapndktest") { sources = [ "//foundation/multimedia/image_standard/interfaces/kits/native/test/unittest/pixel_map_ndk_test.cpp" ] deps = [ - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/multimedia/image_standard/interfaces/kits/native:multimedia_target", "//foundation/multimedia/image_standard/interfaces/kits/native/ndk_test_example:image_ndk_test_jni", "//third_party/googletest:gtest_main", diff --git a/plugins/common/libs/image/libjpegplugin/BUILD.gn b/plugins/common/libs/image/libjpegplugin/BUILD.gn index a28899daa..593d55dbe 100644 --- a/plugins/common/libs/image/libjpegplugin/BUILD.gn +++ b/plugins/common/libs/image/libjpegplugin/BUILD.gn @@ -67,7 +67,7 @@ ohos_shared_library("jpegplugin") { include_dirs += [ "//utils/native/base/include" ] sources += [ "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/src/jpeg_encoder.cpp" ] deps = [ - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", "//third_party/libjpeg:libjpeg_static", "//utils/native/base:utils", -- Gitee From a8959e4baa78c7695c611511d6d05c5fb51f928c Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Sep 2021 23:41:15 +0800 Subject: [PATCH 2/4] modified build.gn Signed-off-by: caochuan --- BUILD.gn | 1 + frameworks/innerkitsimpl/test/BUILD.gn | 13 +- frameworks/innerkitsimpl/utils/BUILD.gn | 2 +- interfaces/innerkits/BUILD.gn | 115 +++++++++++++++--- interfaces/kits/native/test/BUILD.gn | 2 +- .../common/libs/image/libjpegplugin/BUILD.gn | 2 +- 6 files changed, 110 insertions(+), 25 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 733549aa0..58107d321 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,6 +16,7 @@ import("//build/ohos.gni") group("image_framework") { deps = [ "frameworks/innerkitsimpl/utils:image_utils", + "interfaces/innerkits:image_native", "interfaces/innerkits:image", ] } diff --git a/frameworks/innerkitsimpl/test/BUILD.gn b/frameworks/innerkitsimpl/test/BUILD.gn index 4c1ceac59..826809b7e 100644 --- a/frameworks/innerkitsimpl/test/BUILD.gn +++ b/frameworks/innerkitsimpl/test/BUILD.gn @@ -29,9 +29,8 @@ ohos_unittest("imagepixelmaptest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_pixel_map_test.cpp" ] deps = [ - # "//foundation/multimedia/image_standard/adapter/frameworks/bitmapconverter/native:bitmapconverter", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", +# "//foundation/multimedia/image_standard/adapter/frameworks/bitmapconverter/native:bitmapconverter", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -102,7 +101,7 @@ ohos_unittest("imagesourcetest") { deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -127,8 +126,7 @@ ohos_unittest("colorconvertertest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/color_converter_test.cpp" ] deps = [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -153,8 +151,7 @@ ohos_unittest("transformtest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_transform_test.cpp" ] deps = [ - "//base/hiviewdfx/hilog/frameworks/native:libhilogutil", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/innerkitsimpl/utils/BUILD.gn b/frameworks/innerkitsimpl/utils/BUILD.gn index 0e14b2bdf..e0fc358d7 100644 --- a/frameworks/innerkitsimpl/utils/BUILD.gn +++ b/frameworks/innerkitsimpl/utils/BUILD.gn @@ -64,7 +64,7 @@ ohos_shared_library("image_utils") { "hiviewdfx_hilog_native:libhilog", ] } - relative_install_dir = "module/multimedia" + #relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "multimedia_image_standard" } diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 5771cdf70..b1bf81329 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -33,8 +33,7 @@ config("image_external_config") { ] if (use_mingw_win) { - include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + include_dirs += [ "//foundation/multimedia/image_standard/mock/native/include" ] } else if (use_clang_mac) { include_dirs += [ "//foundation/multimedia/image_standard/mock/native/include", @@ -53,19 +52,22 @@ config("image_external_config") { js_declaration("image_js") { part_name = "multimedia_image_standard" - sources = [ "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts" ] + sources = [ + "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts", + ] } ohos_copy("image_declaration") { - sources = [ "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts" ] + sources = [ + "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts", + ] outputs = [ target_out_dir + "/$target_name/" ] module_source_dir = target_out_dir + "/$target_name" module_install_name = "" } -ohos_shared_library("image") { +ohos_shared_library("image"){ public_configs = [ ":image_external_config" ] - sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", @@ -85,11 +87,59 @@ ohos_shared_library("image") { "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", - + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", + + ] + deps = [ + "//foundation/ace/napi:ace_napi", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//utils/native/base:utils", + ] + + external_deps = [ + "bytrace_standard:bytrace_core", + "ipc:ipc_core", + "hiviewdfx_hilog_native:libhilog", + + ] + relative_install_dir = "module/multimedia" + subsystem_name = "multimedia" + part_name = "multimedia_image_standard" +} + + + +ohos_shared_library("image_native") { + public_configs = [ ":image_external_config" ] + + sources = [ + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_source.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map_parcel.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/matrix.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/post_proc.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/scan_line_filter.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", ] if (use_mingw_win) { @@ -143,17 +193,17 @@ ohos_shared_library("image") { ] } external_deps = [ - "bytrace_standard:bytrace_core", - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", + "bytrace_standard:bytrace_core", + "ipc:ipc_core", + "hiviewdfx_hilog_native:libhilog", + ] } - relative_install_dir = "module/multimedia" +# relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "multimedia_image_standard" } - -ohos_static_library("image_static") { +ohos_static_library("image_static_napi"){ public_configs = [ ":image_external_config" ] sources = [ @@ -162,6 +212,7 @@ ohos_static_library("image_static") { "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_source.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map_parcel.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/matrix.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", @@ -174,11 +225,47 @@ ohos_static_library("image_static") { "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", - + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", + ] + deps = [ + "//foundation/ace/napi:ace_napi", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//utils/native/base:utils", + ] + subsystem_name = "multimedia" + part_name = "multimedia_image_standard" +} + +ohos_static_library("image_static") { + public_configs = [ ":image_external_config" ] + + sources = [ + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_source.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/matrix.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/post_proc.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/scan_line_filter.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", ] if (use_mingw_win) { diff --git a/interfaces/kits/native/test/BUILD.gn b/interfaces/kits/native/test/BUILD.gn index 803592a7f..44d70663f 100644 --- a/interfaces/kits/native/test/BUILD.gn +++ b/interfaces/kits/native/test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("pixlmapndktest") { sources = [ "//foundation/multimedia/image_standard/interfaces/kits/native/test/unittest/pixel_map_ndk_test.cpp" ] deps = [ - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/multimedia/image_standard/interfaces/kits/native:multimedia_target", "//foundation/multimedia/image_standard/interfaces/kits/native/ndk_test_example:image_ndk_test_jni", "//third_party/googletest:gtest_main", diff --git a/plugins/common/libs/image/libjpegplugin/BUILD.gn b/plugins/common/libs/image/libjpegplugin/BUILD.gn index a28899daa..593d55dbe 100644 --- a/plugins/common/libs/image/libjpegplugin/BUILD.gn +++ b/plugins/common/libs/image/libjpegplugin/BUILD.gn @@ -67,7 +67,7 @@ ohos_shared_library("jpegplugin") { include_dirs += [ "//utils/native/base/include" ] sources += [ "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/src/jpeg_encoder.cpp" ] deps = [ - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", "//third_party/libjpeg:libjpeg_static", "//utils/native/base:utils", -- Gitee From 779be9c4915b818bdf4fe5ef55e1ac0b7c88a7a7 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 16 Sep 2021 01:10:12 +0800 Subject: [PATCH 3/4] fix gn format issue Signed-off-by: caochuan --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 58107d321..e7f33ac50 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,8 +16,8 @@ import("//build/ohos.gni") group("image_framework") { deps = [ "frameworks/innerkitsimpl/utils:image_utils", - "interfaces/innerkits:image_native", "interfaces/innerkits:image", + "interfaces/innerkits:image_native", ] } -- Gitee From c03715c8c08ed20573bc6723e620e656edee09e4 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 16 Sep 2021 02:00:42 +0800 Subject: [PATCH 4/4] fix gn format Signed-off-by: caochuan --- frameworks/innerkitsimpl/test/BUILD.gn | 2 +- frameworks/innerkitsimpl/utils/BUILD.gn | 1 + interfaces/innerkits/BUILD.gn | 55 ++++++++++++------------- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/frameworks/innerkitsimpl/test/BUILD.gn b/frameworks/innerkitsimpl/test/BUILD.gn index 826809b7e..72f3d28a7 100644 --- a/frameworks/innerkitsimpl/test/BUILD.gn +++ b/frameworks/innerkitsimpl/test/BUILD.gn @@ -29,7 +29,7 @@ ohos_unittest("imagepixelmaptest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_pixel_map_test.cpp" ] deps = [ -# "//foundation/multimedia/image_standard/adapter/frameworks/bitmapconverter/native:bitmapconverter", + # "//foundation/multimedia/image_standard/adapter/frameworks/bitmapconverter/native:bitmapconverter", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/frameworks/innerkitsimpl/utils/BUILD.gn b/frameworks/innerkitsimpl/utils/BUILD.gn index e0fc358d7..1319a0e80 100644 --- a/frameworks/innerkitsimpl/utils/BUILD.gn +++ b/frameworks/innerkitsimpl/utils/BUILD.gn @@ -64,6 +64,7 @@ ohos_shared_library("image_utils") { "hiviewdfx_hilog_native:libhilog", ] } + #relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "multimedia_image_standard" diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index b1bf81329..bf893f776 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -33,7 +33,8 @@ config("image_external_config") { ] if (use_mingw_win) { - include_dirs += [ "//foundation/multimedia/image_standard/mock/native/include" ] + include_dirs += + [ "//foundation/multimedia/image_standard/mock/native/include" ] } else if (use_clang_mac) { include_dirs += [ "//foundation/multimedia/image_standard/mock/native/include", @@ -52,21 +53,17 @@ config("image_external_config") { js_declaration("image_js") { part_name = "multimedia_image_standard" - sources = [ - "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts", - ] + sources = [ "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts" ] } ohos_copy("image_declaration") { - sources = [ - "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts", - ] + sources = [ "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts" ] outputs = [ target_out_dir + "/$target_name/" ] module_source_dir = target_out_dir + "/$target_name" module_install_name = "" } -ohos_shared_library("image"){ +ohos_shared_library("image") { public_configs = [ ":image_external_config" ] sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", @@ -87,11 +84,11 @@ ohos_shared_library("image"){ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", - + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", ] deps = [ "//foundation/ace/napi:ace_napi", @@ -102,18 +99,15 @@ ohos_shared_library("image"){ ] external_deps = [ - "bytrace_standard:bytrace_core", - "ipc:ipc_core", - "hiviewdfx_hilog_native:libhilog", - + "bytrace_standard:bytrace_core", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", ] relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "multimedia_image_standard" } - - ohos_shared_library("image_native") { public_configs = [ ":image_external_config" ] @@ -136,10 +130,11 @@ ohos_shared_library("image_native") { "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", ] if (use_mingw_win) { @@ -193,17 +188,17 @@ ohos_shared_library("image_native") { ] } external_deps = [ - "bytrace_standard:bytrace_core", - "ipc:ipc_core", - "hiviewdfx_hilog_native:libhilog", - + "bytrace_standard:bytrace_core", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", ] } -# relative_install_dir = "module/multimedia" + + # relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "multimedia_image_standard" } -ohos_static_library("image_static_napi"){ +ohos_static_library("image_static_napi") { public_configs = [ ":image_external_config" ] sources = [ @@ -225,10 +220,11 @@ ohos_static_library("image_static_napi"){ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", ] deps = [ "//foundation/ace/napi:ace_napi", @@ -262,10 +258,11 @@ ohos_static_library("image_static") { "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", ] if (use_mingw_win) { -- Gitee