Skip to content

Commit 5160e8c

Browse files
Mike KleinSkia Commit-Bot
authored andcommitted
Revert "Exclude gl files for Fuchsia platform."
This reverts commit c1f3f8c. Reason for revert: duplicate symbols on other platforms ld.lld: error: duplicate symbol: GrGLCreateNativeInterface() >>> defined at GrGLMakeNativeInterface_none.cpp:12 (third_party/skia/HEAD/src/gpu/gl/GrGLMakeNativeInterface_none.cpp:12) >>> blaze-out/arm64-v8a-fastbuild/bin/third_party/skia/HEAD/_objs/skia/GrGLMakeNativeInterface_none.pic.o:(GrGLCreateNativeInterface()) >>> defined at GrGLMakeNativeInterface_egl.cpp:137 (third_party/skia/HEAD/src/gpu/gl/android/../egl/GrGLMakeNativeInterface_egl.cpp:137) >>> blaze-out/arm64-v8a-fastbuild/bin/third_party/skia/HEAD/_objs/skia/GrGLMakeNativeInterface_android.pic.o:(.text._Z25GrGLCreateNativeInterfacev+0x0) I even ran the G3 trybot and forgot to see if it was green... Original change's description: > Exclude gl files for Fuchsia platform. > > Fuchsia platform supports only vulkan. So exclude all gl files and > add vulkan files for building Skia on Fuchsia. > > Change-Id: I2593a14926747b1154a1134bfdd43772627110a4 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/301739 > Reviewed-by: Mike Klein <mtklein@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=mtklein@google.com,bsalomon@google.com,guruji@google.com Change-Id: If2623c600c5b3fc43bf896b4da02dc7cf61d8a27 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/301896 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
1 parent 082323b commit 5160e8c

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

public.bzl

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,6 @@ BASE_SRCS_ALL = struct(
235235
# Conflicting dependencies among Lua versions. See cl/107087297.
236236
"src/utils/SkLua*",
237237

238-
# Exclude all GL specific files
239-
"src/gpu/gl/*",
240-
"src/gpu/gl/builders/*",
241-
242238
# Currently exclude all vulkan specific files
243239
"src/gpu/vk/*",
244240

@@ -270,8 +266,6 @@ def codec_srcs(limited):
270266

271267
GL_SRCS_UNIX = struct(
272268
include = [
273-
"src/gpu/gl/*",
274-
"src/gpu/gl/builders/*",
275269
"src/gpu/gl/GrGLMakeNativeInterface_none.cpp",
276270
],
277271
exclude = [],
@@ -302,8 +296,6 @@ PORTS_SRCS_UNIX = struct(
302296

303297
GL_SRCS_ANDROID = struct(
304298
include = [
305-
"src/gpu/gl/*",
306-
"src/gpu/gl/builders/*",
307299
"src/gpu/gl/android/*.cpp",
308300
],
309301
exclude = [],
@@ -335,8 +327,6 @@ PORTS_SRCS_ANDROID = struct(
335327

336328
GL_SRCS_IOS = struct(
337329
include = [
338-
"src/gpu/gl/*",
339-
"src/gpu/gl/builders/*",
340330
"src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS.cpp",
341331
],
342332
exclude = [],
@@ -372,8 +362,6 @@ PORTS_SRCS_IOS = struct(
372362

373363
GL_SRCS_WASM = struct(
374364
include = [
375-
"src/gpu/gl/*",
376-
"src/gpu/gl/builders/*",
377365
"src/gpu/gl/GrGLMakeNativeInterface_egl.cpp",
378366
"src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp",
379367
],
@@ -415,7 +403,7 @@ PORTS_SRCS_WASM = struct(
415403

416404
GL_SRCS_FUCHSIA = struct(
417405
include = [
418-
"src/gpu/vk/*",
406+
"src/gpu/gl/GrGLMakeNativeInterface_none.cpp",
419407
],
420408
exclude = [],
421409
)

0 commit comments

Comments
 (0)