openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2024-11-23 15:11:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

modify bundle.json

Browse Source 
Signed-off-by: hudi33 <chenbing33@huawei.com>
Change-Id: Iacdb9945f7d24dd716d61133480ec59092bbf8be
This commit is contained in:
hudi33 2022-01-24 10:25:54 +08:00
parent a4e7046a63
commit 08a97ef0a0
15 changed files with 87 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
bundle.json
View File

@ -1,19 +1,34 @@
{
"name": "@openharmony/graphic_standard",
"version": "3.1.0",
"name": "@ohos/graphic_standard",
"description": "graphic_standard",
"repository": "",
"version": "3.1",
"license": "Apache License 2.0",
"publishAs": "code-segment",
"segment": {
"destPath": "foundation/graphic/standard"
},
"dirs": {},
"scripts": {},
"component": {
"name": "graphic_standard",
"subsystem": "graphic",
"adapted_system_type": [ "standard" ],
"rom": {},
"ram": {},
"rom": "10000KB",
"ram": "10000KB",
"deps": {
"components": [
"libhilog",
"ipc_core",
"samgr_proxy",
"utils",
"libeventhandler",
"image_native",
"hdi_display_device",
"bytrace_core"
],
"third_party": [
"libz",
"libdrm"
]
},
"build": {
@ -60,6 +75,38 @@
"header_base": "//foundation/graphic/standard/interfaces/innerkits/surface"
}
},
{
"type": "so",
"name": "//foundation/graphic/standard/frameworks/vsync:libvsync_client",
"header": {
"header_files": [
"vsync_helper.h"
],
"header_base": "//foundation/graphic/standard/interfaces/innerkits/vsync"
}
},
{
"type": "so",
"name": "//foundation/graphic/standard/frameworks/vsync:libvsync_module",
"header": {
"header_files": [
"vsync_module.h",
"vsync_module_c.h"
],
"header_base": "//foundation/graphic/standard/interfaces/innerkits/vsync_module"
}
},
{
"type": "so",
"name": "//foundation/graphic/standard/utils:libgraphic_utils",
"header": {
"header_files": [
"graphic_common.h",
"graphic_common_c.h"
],
"header_base": "//foundation/graphic/standard/interfaces/innerkits/common"
}
},
{
"type": "so",
"name": "//foundation/graphic/standard/frameworks/wm:libwmclient",

41
frameworks/dumper/BUILD.gn
View File

@ -17,10 +17,7 @@ import("//build/ohos.gni")
config("graphic_dumper_client_config") {
visibility = [ ":*" ]
include_dirs = [
"include",
"//utils/system/safwk/native/include",
]
include_dirs = [ "include" ]
cflags = [
"-Wall",
@ -30,11 +27,7 @@ config("graphic_dumper_client_config") {
}
config("graphic_dumper_client_public_config") {
include_dirs = [
"//foundation/graphic/standard/interfaces/innerkits/dumper",
"//foundation/graphic/standard/interfaces/innerkits/common",
"//utils/native/base/include",
]
include_dirs = [ "common" ]
}
ohos_shared_library("libgraphic_dumper_client") {
@ -49,16 +42,15 @@ ohos_shared_library("libgraphic_dumper_client") {
public_configs = [ ":graphic_dumper_client_public_config" ]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/standard/utils:libgraphic_utils",
deps = [ "//foundation/graphic/standard/utils:libgraphic_utils" ]
external_deps = [
"hilog_native:libhilog",
"ipc:ipc_core",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
external_deps = [ "ipc:ipc_core" ]
public_deps = [ "//utils/native/base:utils" ]
part_name = "graphic_standard"
subsystem_name = "graphic"
}
@ -69,10 +61,7 @@ ohos_shared_library("libgraphic_dumper_client") {
config("graphic_dumper_server_config") {
visibility = [ ":*" ]
include_dirs = [
"include",
"//utils/system/safwk/native/include",
]
include_dirs = [ "include" ]
cflags = [
"-Wall",
@ -105,14 +94,15 @@ ohos_executable("graphic_dumper_server") {
]
deps = [
"//foundation/graphic/standard/utils:libgraphic_utils",
"//third_party/zlib:libz",
"//utils/native/base:utils",
]
external_deps = [
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
part_name = "graphic_standard"
@ -125,10 +115,7 @@ ohos_executable("graphic_dumper_server") {
config("gdumper_config") {
visibility = [ ":*" ]
include_dirs = [
"include",
"//utils/system/safwk/native/include",
]
include_dirs = [ "include" ]
cflags = [
"-Wall",
@ -164,13 +151,13 @@ ohos_executable("gdumper") {
deps = [
"//foundation/graphic/standard/utils:libgraphic_utils",
"//third_party/zlib:libz",
"//utils/native/base:utils",
]
external_deps = [
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
part_name = "graphic_standard"

0
interfaces/innerkits/dumper/graphic_dumper_helper.h → frameworks/dumper/common/graphic_dumper_helper.h
View File

3
frameworks/dumper/include/graphic_dumper_helper_impl.h
View File

@ -22,10 +22,9 @@
#include <map>
#include <memory>
#include <graphic_dumper_helper.h>
#include "ipc/graphic_dumper_service_proxy.h"
#include "ipc/graphic_dumper_client_listener_stub.h"
#include "graphic_dumper_helper.h"
namespace OHOS {
namespace {

2
frameworks/dumper/src/graphic_dumper_helper.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include <graphic_dumper_helper.h>
#include "graphic_dumper_helper.h"
#include <cstdarg>

12
frameworks/fence/BUILD.gn
View File

@ -25,10 +25,7 @@ config("fence_config") {
}
config("fence_public_config") {
include_dirs = [
"//utils/native/base/include",
"//foundation/graphic/standard/interfaces/innerkits/fence",
]
include_dirs = [ "include" ]
}
ohos_shared_library("libfence") {
@ -38,9 +35,10 @@ ohos_shared_library("libfence") {
public_configs = [ ":fence_public_config" ]
deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog" ]
public_deps = [ "//utils/native/base:utils" ]
external_deps = [
"hilog_native:libhilog",
"utils_base:utils",
]
part_name = "graphic_standard"
subsystem_name = "graphic"

0
interfaces/innerkits/fence/fence.h → frameworks/fence/include/fence.h
View File

8
frameworks/surface/BUILD.gn
View File

@ -28,10 +28,8 @@ config("surface_config") {
}
config("surface_public_config") {
include_dirs = [
"//foundation/graphic/standard/interfaces/innerkits/surface",
"//foundation/graphic/standard/interfaces/innerkits/common",
]
include_dirs =
[ "//foundation/graphic/standard/interfaces/innerkits/surface" ]
if (ace_enable_gpu) {
defines = [ "ACE_ENABLE_GPU" ]
@ -82,7 +80,6 @@ ohos_shared_library("surface") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/standard/utils:libgraphic_utils",
]
public_deps = [
@ -90,6 +87,7 @@ ohos_shared_library("surface") {
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/graphic/standard:libgl",
"//foundation/graphic/standard/utils:buffer_handle",
"//foundation/graphic/standard/utils:libgraphic_utils",
"//utils/native/base:utils",
]

1
frameworks/vsync/BUILD.gn
View File

@ -32,7 +32,6 @@ config("libvsync_client_config") {
config("libvsync_client_public_config") {
include_dirs = [
"//foundation/graphic/standard/interfaces/innerkits/vsync",
"//foundation/graphic/standard/interfaces/innerkits/common",
"//utils/native/base/include",
]
}

2
frameworks/vsync/include/vsync_helper_impl.h
View File

@ -22,10 +22,10 @@
#include <mutex>
#include <queue>
#include <graphic_dumper_helper.h>
#include <refbase.h>
#include <vsync_helper.h>
#include "graphic_dumper_helper.h"
#include "ivsync_manager.h"
#include "vsync_callback_stub.h"

2
frameworks/wmtest/test/dumper_test_1.cpp
View File

@ -19,9 +19,9 @@
#include <string>
#include <unistd.h>
#include <graphic_dumper_helper.h>
#include <option_parser.h>
#include "graphic_dumper_helper.h"
#include "inative_test.h"
#include "native_test_class.h"
#include "util.h"

1
rosen/modules/composer/BUILD.gn
View File

@ -62,6 +62,7 @@ ohos_shared_library("libcomposer") {
"//drivers/peripheral/display/hal:hdi_display_device",
"//foundation/graphic/standard:libsurface",
"//foundation/graphic/standard/frameworks/vsync:libvsync_module",
"//foundation/graphic/standard/utils:libgraphic_utils",
]
public_deps = [

1
rosen/samples/2d_graphics/BUILD.gn
View File

@ -126,6 +126,7 @@ ohos_executable("drawing_sample_canvaskit0310") {
"//foundation/graphic/standard:libvsync_client",
"//foundation/graphic/standard/rosen/modules/2d_graphics:2d_graphics_canvaskit0310",
"//foundation/graphic/standard/rosen/modules/composer:libcomposer",
"//foundation/graphic/standard/utils:libgraphic_utils",
"//foundation/graphic/standard/utils:sync_fence",
]

2
rosen/samples/composer/BUILD.gn
View File

@ -30,7 +30,6 @@ config("hello_composer_public_config") {
"//drivers/peripheral/display/interfaces/include",
"//foundation/graphic/standard/rosen/include/common",
"//foundation/graphic/standard/interfaces/innerkits/vsync_module",
"//foundation/graphic/standard/interfaces/innerkits/common",
"//foundation/graphic/standard/rosen/modules/composer/vsync/include",
]
}
@ -53,6 +52,7 @@ ohos_executable("hello_composer") {
"//foundation/graphic/standard:libsurface",
"//foundation/graphic/standard:libvsync_client",
"//foundation/graphic/standard/rosen/modules/composer:libcomposer",
"//foundation/graphic/standard/utils:libgraphic_utils",
"//foundation/graphic/standard/utils:sync_fence",
]

6
utils/BUILD.gn
View File

@ -67,7 +67,13 @@ group("sync_fence") {
}
## Build libgraphic_utils.so {{{
config("libgraphic_utils_public_config") {
include_dirs = [ "//foundation/graphic/standard/interfaces/innerkits/common" ]
}
ohos_shared_library("libgraphic_utils") {
public_configs = [ ":libgraphic_utils_public_config" ]
public_deps = [
"buffer_handle:buffer_handle",
"cpudraw:cpudraw",