Skip to content

Commit a2634f4

Browse files
swift-kimJSUYA
authored andcommitted
[Tizen] Upgrade Clang to 17.0.6
1 parent 5015d89 commit a2634f4

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

ci/tizen/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/llvm-project*/
2-
/toolchains/
2+
/toolchains*/
33
/sysroot/

ci/tizen/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
### Stage for building LLVM ###
33
###############################
44

5-
FROM ubuntu:20.04 AS llvm
5+
FROM ubuntu:22.04 AS llvm
66

77
ENV DEBIAN_FRONTEND=noninteractive
88

@@ -19,13 +19,13 @@ RUN /build_llvm.sh
1919
### Create a release image ###
2020
##############################
2121

22-
FROM ubuntu:20.04
22+
FROM ubuntu:22.04
2323

2424
ENV DEBIAN_FRONTEND=noninteractive
2525

2626
RUN apt-get update && \
2727
apt-get install -y binutils-arm-linux-gnueabi binutils-aarch64-linux-gnu binutils-i686-linux-gnu && \
28-
apt-get install -y git curl pkg-config ca-certificates python python3 python3-pip rpm2cpio cpio && \
28+
apt-get install -y git curl pkg-config ca-certificates python3 python3-pip rpm2cpio cpio && \
2929
apt-get clean
3030

3131
# Copy build artifacts from the previous stage.

ci/tizen/build_llvm.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
cd llvm-project
1919
git init
2020
git remote add origin https://github.com/llvm/llvm-project.git
21-
git fetch --depth=1 origin aaaf8e4c409f080f35ea227b20dc6ac8a45c2fa4
21+
git fetch --depth=1 origin llvmorg-17.0.6
2222
git checkout FETCH_HEAD
2323
fi
2424

@@ -33,7 +33,7 @@ cmake -G Ninja \
3333
-DCMAKE_BUILD_TYPE=Release \
3434
-DCMAKE_INSTALL_PREFIX="$OUTPUT_DIR" \
3535
../llvm
36-
ninja install
36+
ninja install -j$(nproc)
3737

3838
# Create symbolic links to binutils.
3939
# See build/toolchain/custom/BUILD.gn for more information.

shell/common/rasterizer.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,7 @@ std::unique_ptr<Rasterizer::GpuImageResult> Rasterizer::MakeSkiaGpuImage(
351351
// https://github.com/flutter/flutter/issues/108835
352352
#if FML_OS_LINUX
353353
return MakeBitmapImage(display_list, image_info);
354-
#endif
355-
354+
#else
356355
std::unique_ptr<SnapshotDelegate::GpuImageResult> result;
357356
delegate_.GetIsGpuDisabledSyncSwitch()->Execute(
358357
fml::SyncSwitch::Handlers()
@@ -404,6 +403,7 @@ std::unique_ptr<Rasterizer::GpuImageResult> Rasterizer::MakeSkiaGpuImage(
404403
texture, sk_ref_sp(context), nullptr, "");
405404
}));
406405
return result;
406+
#endif
407407
}
408408

409409
sk_sp<DlImage> Rasterizer::MakeRasterSnapshot(sk_sp<DisplayList> display_list,

shell/common/rasterizer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ class Rasterizer final : public SnapshotDelegate,
715715

716716
bool is_torn_down_ = false;
717717
Delegate& delegate_;
718-
MakeGpuImageBehavior gpu_image_behavior_;
718+
[[maybe_unused]] MakeGpuImageBehavior gpu_image_behavior_;
719719
std::weak_ptr<impeller::Context> impeller_context_;
720720
std::unique_ptr<Surface> surface_;
721721
std::unique_ptr<SnapshotSurfaceProducer> snapshot_surface_producer_;

0 commit comments

Comments
 (0)