From 313869939d9dc99071558c5d8fadd4f33650240b Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Fri, 3 Jul 2020 14:01:41 +0000 Subject: [PATCH] Revert "Use Wuffs v0.3 by default, not v0.2" This reverts commit 7a3ea55259873508171a0e488930d383530d5d41. Reason for revert: linker failures rolling to Flutter, e.g [5594/5828] LINK ./flow_unittests FAILED: flow_unittests exe.unstripped/flow_unittests /b/s/w/ir/cache/goma/client/gomacc ../../buildtools/linux-x64/clang/bin/clang++ -Wl,--fatal-warnings -m64 -fPIC -Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -pthread --sysroot=/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot -L/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/usr/local/lib/x86_64-linux-gnu\ -Wl,-rpath-link=/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/usr/local/lib/x86_64-linux-gnu\ -L/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/lib/x86_64-linux-gnu\ -Wl,-rpath-link=/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/lib/x86_64-linux-gnu\ -L/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/usr/lib/x86_64-linux-gnu\ -Wl,-rpath-link=/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/usr/lib/x86_64-linux-gnu -Wl,-rpath=\$ORIGIN/ -Wl,-rpath-link= -Wl,--disable-new-dtags -o ./exe.unstripped/flow_unittests -Wl,--build-id=sha1 -Wl,--start-group @./flow_unittests.rsp -Wl,--end-group -ldl -lpthread && strip --strip-unneeded -o ./flow_unittests ./exe.unstripped/flow_unittests ld.lld: error: undefined symbol: wuffs_base__note__end_of_data >>> referenced by SkWuffsCodec.cpp:0 (../../third_party/skia/src/codec/SkWuffsCodec.cpp:0) >>> obj/third_party/skia/src/codec/wuffs.SkWuffsCodec.o:(SkWuffsCodec::onGetFrameCountInternal()) clang-11: error: linker command failed with exit code 1 (use -v to see invocation) https://github.com/flutter/engine/pull/19466 https://ci.chromium.org/p/flutter/builders/try/Linux%20Host%20Engine/9900? (among several) Original change's description: > Use Wuffs v0.3 by default, not v0.2 > > Change-Id: Ie57fea197778f4b17ca08d2e3022b77f783de927 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298616 > Reviewed-by: Leon Scroggins > Commit-Queue: Mike Klein TBR=mtklein@google.com,scroggo@google.com,nigeltao@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: Ie21293deade92e064099ebd5d41de69dbf8b2545 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/300413 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- BUILD.gn | 6 ++++-- third_party/wuffs/BUILD.gn | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index f41ce376e7..a100586668 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -906,7 +906,6 @@ optional("wuffs") { enabled = skia_use_wuffs public_defines = [ "SK_HAS_WUFFS_LIBRARY", - # SK_FAVOR_WUFFS_V_0_3_OVER_V_0_2 is temporary, used during a multiple step # transition (perhaps a month or two in mid 2020), distributed across # multiple repositories: @@ -925,7 +924,10 @@ optional("wuffs") { # Steps 2a and 2b can occur concurrently. Similarly for 3a and 3b. # # "Users" means software that uses Skia+Wuffs, such as Chromium or Flutter. - "SK_FAVOR_WUFFS_V_0_3_OVER_V_0_2", + # + # Uncommenting the next line (as well as changing "0.2" to "0.3" in + # "etc/wuffs-v0.2.c" in third_party/wuffs/BUILD.gn) is step 3b. + # "SK_FAVOR_WUFFS_V_0_3_OVER_V_0_2", ] deps = [ "//third_party/wuffs" ] diff --git a/third_party/wuffs/BUILD.gn b/third_party/wuffs/BUILD.gn index 0b303b134a..a5d32a7ed5 100644 --- a/third_party/wuffs/BUILD.gn +++ b/third_party/wuffs/BUILD.gn @@ -45,5 +45,5 @@ third_party("wuffs") { "WUFFS_CONFIG__MODULE__LZW", ] - sources = [ "../externals/wuffs/release/c/wuffs-v0.3.c" ] + sources = [ "../externals/wuffs/release/c/wuffs-v0.2.c" ] }