From 490899dc7b7cfaad1ea0e3b3aee92d71586494d0 Mon Sep 17 00:00:00 2001 From: Jorge Betancourt Date: Tue, 7 Mar 2023 12:48:37 -0500 Subject: [PATCH] correct linker opts for internal builds of JetSki Change-Id: I81c697b9845b1dfa9c51db70b467297901c4618b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/653276 Commit-Queue: Jorge Betancourt Reviewed-by: Florin Malita --- modules/jetski/BUILD.bazel | 5 +++++ tools/window/android/BUILD.bazel | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/jetski/BUILD.bazel b/modules/jetski/BUILD.bazel index 4d01ecbc0b28..cdd970280681 100644 --- a/modules/jetski/BUILD.bazel +++ b/modules/jetski/BUILD.bazel @@ -18,6 +18,11 @@ skia_cc_library( "src/Utils.cpp", "src/Utils.h", ], + linkopts = [ + "-ljnigraphics", + "-lEGL", + "-lGLESv2", + ], visibility = ["//platform_tools/android/apps/jetski:__pkg__"], deps = [ "//:skia_internal", diff --git a/tools/window/android/BUILD.bazel b/tools/window/android/BUILD.bazel index 0c36fd3eb1f3..294f0a6a98cd 100644 --- a/tools/window/android/BUILD.bazel +++ b/tools/window/android/BUILD.bazel @@ -17,15 +17,6 @@ skia_filegroup( skia_cc_deps( name = "deps", - linkopts = [ - "-lX11", - "-lxcb", # dep of X11 - "-lXau", # dep of xcb - "-lXdmcp", # dep of xcb - ] + select({ - "//src/gpu:vulkan_backend": ["-lX11-xcb"], - "//conditions:default": [], - }), visibility = ["//tools/window:__pkg__"], deps = select({ "//src/gpu:vulkan_backend": ["//tools/gpu/vk:testutils"],