!5120 Fix build.gn in surface

Merge pull request !5120 from hujunjian72/buildgn
This commit is contained in:
openharmony_ci 2023-06-30 09:41:35 +00:00 committed by Gitee
commit bf81449de2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 26 additions and 23 deletions

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
## Build libvulkan_swapchain.so {{{
config("vulkan_config") {
@ -43,12 +44,14 @@ ohos_shared_library("vulkan_swapchain_layer") {
public_configs = [ ":vulkan_public_config" ]
deps = [ "//third_party/vulkan-headers:vulkan_headers" ]
deps = [
"$graphic_2d_root:libsurface",
"$graphic_2d_root/utils:sync_fence",
"//third_party/vulkan-headers:vulkan_headers",
]
external_deps = [
"c_utils:utils",
"graphic_standard:surface",
"graphic_standard:sync_fence",
"hilog_native:libhilog",
]

View File

@ -60,24 +60,22 @@ ohos_shared_library("libcomposer") {
"//commonlibrary/c_utils/base:utils_config",
]
deps = [
"$graphic_2d_root:libsurface",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
]
deps = [ "$graphic_2d_root:libsurface" ]
public_deps = [
"$graphic_2d_root/utils:buffer_handle",
"$graphic_2d_root/utils:scoped_bytrace",
"$graphic_2d_root/utils:sync_fence",
"vsync:libvsync",
"//commonlibrary/c_utils/base:utils",
]
external_deps = [
"c_utils:utils",
"drivers_interface_display:display_buffer_idl_headers",
"drivers_interface_display:display_composer_idl_headers",
"drivers_interface_display:libdisplay_composer_hdi_impl",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
]
part_name = "graphic_standard"

View File

@ -12,6 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
## Build libnative_vsync.so
@ -47,10 +48,9 @@ ohos_shared_library("libnative_vsync") {
output_extension = "so"
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
]
deps = [ "$graphic_2d_root/rosen/modules/render_service_client:librender_service_client" ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "graphic_standard"
subsystem_name = "graphic"

View File

@ -63,16 +63,14 @@ ohos_shared_library("libvsync") {
deps = [
"$graphic_2d_root/utils:sandbox_utils",
"$graphic_2d_root/utils:socketpair",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
]
public_deps = [
"$graphic_2d_root/utils:scoped_bytrace",
"//commonlibrary/c_utils/base:utils",
]
public_deps = [ "$graphic_2d_root/utils:scoped_bytrace" ]
external_deps = [
"c_utils:utils",
"eventhandler:libeventhandler",
"hilog_native:libhilog",
"ipc:ipc_core",
]
if (defined(graphic_2d_ext_configs.vendor_root)) {

View File

@ -35,6 +35,7 @@ ohos_fuzztest("VsyncControllerFuzzTest") {
deps = [
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync:libvsync",
]
external_deps = [ "c_utils:utils" ]
}
###############################################################################

View File

@ -35,6 +35,7 @@ ohos_fuzztest("VsyncSamplerFuzzTest") {
deps = [
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync:libvsync",
]
external_deps = [ "c_utils:utils" ]
}
###############################################################################

View File

@ -50,6 +50,7 @@ ohos_unittest("vsync_controller_test") {
sources = [ "vsync_controller_test.cpp" ]
deps = [ ":vsync_test_common" ]
external_deps = [ "c_utils:utils" ]
}
## UnitTest vsync_controller_test }}}
@ -75,6 +76,7 @@ ohos_unittest("vsync_generator_test") {
sources = [ "vsync_generator_test.cpp" ]
deps = [ ":vsync_test_common" ]
external_deps = [ "c_utils:utils" ]
}
## UnitTest vsync_generator_test }}}
@ -101,6 +103,7 @@ ohos_unittest("vsync_sampler_test") {
sources = [ "vsync_sampler_test.cpp" ]
deps = [ ":vsync_test_common" ]
external_deps = [ "c_utils:utils" ]
}
## UnitTest vsync_sampler_test }}}

View File

@ -28,12 +28,11 @@ ohos_static_library("buffer_handle") {
public_configs = [ ":buffer_handle_public_config" ]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_single",
]
public_deps = [ "//commonlibrary/c_utils/base:utils" ]
subsystem_name = "graphic"
part_name = "graphic_standard"
}