From 5160e8caa226213c77b2a5f98908aa4eeee75ef5 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Fri, 10 Jul 2020 15:07:18 +0000 Subject: [PATCH] Revert "Exclude gl files for Fuchsia platform." This reverts commit c1f3f8cda4c9cb35ea01385f8a5d842bb176682d. 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 > Reviewed-by: Brian Salomon > Commit-Queue: Mike Klein 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 Commit-Queue: Mike Klein --- public.bzl | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/public.bzl b/public.bzl index 632b6831fb5e2..84a8f8b10dac2 100644 --- a/public.bzl +++ b/public.bzl @@ -235,10 +235,6 @@ BASE_SRCS_ALL = struct( # Conflicting dependencies among Lua versions. See cl/107087297. "src/utils/SkLua*", - # Exclude all GL specific files - "src/gpu/gl/*", - "src/gpu/gl/builders/*", - # Currently exclude all vulkan specific files "src/gpu/vk/*", @@ -270,8 +266,6 @@ def codec_srcs(limited): GL_SRCS_UNIX = struct( include = [ - "src/gpu/gl/*", - "src/gpu/gl/builders/*", "src/gpu/gl/GrGLMakeNativeInterface_none.cpp", ], exclude = [], @@ -302,8 +296,6 @@ PORTS_SRCS_UNIX = struct( GL_SRCS_ANDROID = struct( include = [ - "src/gpu/gl/*", - "src/gpu/gl/builders/*", "src/gpu/gl/android/*.cpp", ], exclude = [], @@ -335,8 +327,6 @@ PORTS_SRCS_ANDROID = struct( GL_SRCS_IOS = struct( include = [ - "src/gpu/gl/*", - "src/gpu/gl/builders/*", "src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS.cpp", ], exclude = [], @@ -372,8 +362,6 @@ PORTS_SRCS_IOS = struct( GL_SRCS_WASM = struct( include = [ - "src/gpu/gl/*", - "src/gpu/gl/builders/*", "src/gpu/gl/GrGLMakeNativeInterface_egl.cpp", "src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp", ], @@ -415,7 +403,7 @@ PORTS_SRCS_WASM = struct( GL_SRCS_FUCHSIA = struct( include = [ - "src/gpu/vk/*", + "src/gpu/gl/GrGLMakeNativeInterface_none.cpp", ], exclude = [], )