[Tizen] Upgrade Clang to 17.0.6

flutter-tizen · Dec 4, 2023 · 4eff894 · 4eff894
1 parent 26bb2af
commit 4eff894
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/ci/tizen/.gitignore b/ci/tizen/.gitignore
@@ -1,3 +1,3 @@
 /llvm-project*/
-/toolchains/
+/toolchains*/
 /sysroot/
diff --git a/ci/tizen/Dockerfile b/ci/tizen/Dockerfile
@@ -2,7 +2,7 @@
 ### Stage for building LLVM ###
 ###############################
 
-FROM ubuntu:20.04 AS llvm
+FROM ubuntu:22.04 AS llvm
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -19,13 +19,13 @@ RUN /build_llvm.sh
 ### Create a release image ###
 ##############################
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
     apt-get install -y binutils-arm-linux-gnueabi binutils-aarch64-linux-gnu binutils-i686-linux-gnu && \
-    apt-get install -y git curl pkg-config ca-certificates python python3 python3-pip rpm2cpio cpio && \
+    apt-get install -y git curl pkg-config ca-certificates python3 python3-pip rpm2cpio cpio && \
     apt-get clean
 
 # Copy build artifacts from the previous stage.

diff --git a/ci/tizen/build_llvm.sh b/ci/tizen/build_llvm.sh
@@ -18,7 +18,7 @@ else
   cd llvm-project
   git init
   git remote add origin https://github.com/llvm/llvm-project.git
-  git fetch --depth=1 origin aaaf8e4c409f080f35ea227b20dc6ac8a45c2fa4
+  git fetch --depth=1 origin llvmorg-17.0.6
   git checkout FETCH_HEAD
 fi
 
@@ -33,7 +33,7 @@ cmake -G Ninja \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_INSTALL_PREFIX="$OUTPUT_DIR" \
   ../llvm
-ninja install
+ninja install -j$(nproc)
 
 # Create symbolic links to binutils.
 # See build/toolchain/custom/BUILD.gn for more information.

diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc
@@ -319,8 +319,7 @@ std::unique_ptr<Rasterizer::GpuImageResult> Rasterizer::MakeSkiaGpuImage(
 // https://github.com/flutter/flutter/issues/108835
 #if FML_OS_LINUX
   return MakeBitmapImage(display_list, image_info);
-#endif
-
+#else
   std::unique_ptr<SnapshotDelegate::GpuImageResult> result;
   delegate_.GetIsGpuDisabledSyncSwitch()->Execute(
       fml::SyncSwitch::Handlers()
@@ -372,6 +371,7 @@ std::unique_ptr<Rasterizer::GpuImageResult> Rasterizer::MakeSkiaGpuImage(
                 texture, sk_ref_sp(context), nullptr, "");
           }));
   return result;
+#endif
 }
 
 sk_sp<DlImage> Rasterizer::MakeRasterSnapshot(sk_sp<DisplayList> display_list,

diff --git a/shell/common/rasterizer.h b/shell/common/rasterizer.h
@@ -598,7 +598,7 @@ class Rasterizer final : public SnapshotDelegate,
   static bool ShouldResubmitFrame(const RasterStatus& raster_status);
 
   Delegate& delegate_;
-  MakeGpuImageBehavior gpu_image_behavior_;
+  [[maybe_unused]] MakeGpuImageBehavior gpu_image_behavior_;
   std::weak_ptr<impeller::Context> impeller_context_;
   std::unique_ptr<Surface> surface_;
   std::unique_ptr<SnapshotSurfaceProducer> snapshot_surface_producer_;