x64 test

Author: JSUYA

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        arch: [arm, arm64, x86]
+        arch: [arm, arm64, x86, x64]
         mode: [debug, release, profile]
         include:
           - arch: arm
@@ -21,11 +21,8 @@ jobs:
             triple: aarch64-linux-gnu
           - arch: x86
             triple: i686-linux-gnu
-        exclude:
-          - arch: x86
-            mode: release
-          - arch: x86
-            mode: profile
+          - arch: x64
+            triple: x86_64-linux-gnu
 
     steps:
       - uses: actions/checkout@v4
@@ -58,6 +55,7 @@ jobs:
         run: flutter/engine/src/flutter/ci/tizen/generate_sysroot.py --out /tizen_tools/sysroot
 
       - name: Build
+        if: ${{ matrix.arch != x64 }}
         run: |
           cd flutter
           # Ignore unsupported linker option.
@@ -78,12 +76,37 @@ jobs:
           ninja -C out/build flutter_engine_library
           cp -f flutter/third_party/icu/flutter/icudtl.dat out/build
 
+      - name: Build(x64)
+        if: ${{ matrix.arch == x64 }}
+        run: |
+          cd flutter
+
+          flutter/tools/gn \
+          --target-os linux \
+          --linux-cpu ${{ matrix.arch }} \
+          --no-goma \
+          --target-triple ${{ matrix.triple }} \
+          --runtime-mode ${{ matrix.mode }} \
+          --enable-fontconfig \
+          --disable-desktop-embeddings \
+          --target-dir build
+
+          cd engine/src
+          ninja -C out/build flutter_engine_library
+          cp -f flutter/third_party/icu/flutter/icudtl.dat out/build
+
       - name: Build gen_snapshot
-        if: ${{ matrix.mode != 'debug' }}
+        if: ${{ matrix.mode != 'debug' && matrix.arch != x64}}
         run: |
           cd flutter
           ninja -C engine/src/out/build clang_x64/gen_snapshot
 
+      - name: Build gen_snapshot(x64)
+        if: ${{ matrix.mode != 'debug' && matrix.arch == x64}}
+        run: |
+          cd flutter
+          ninja -C engine/src/out/build gen_snapshot
+
       - uses: actions/upload-artifact@v4
         with:
           name: tizen-${{ matrix.arch }}-${{ matrix.mode }}
@@ -106,6 +129,20 @@ jobs:
           path: flutter/engine/src/out/build/clang_x64/gen_snapshot
           if-no-files-found: error
 
+      - uses: actions/upload-artifact@v4
+        if: ${{ matrix.mode != 'debug' && matrix.arch != x64}}
+        with:
+          name: tizen-${{ matrix.arch }}-${{ matrix.mode }}_linux-x64
+          path: flutter/engine/src/out/build/clang_x64/gen_snapshot
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ matrix.mode != 'debug' && matrix.arch == x64}}
+        with:
+          name: tizen-${{ matrix.arch }}-${{ matrix.mode }}_linux-x64
+          path: flutter/engine/src/out/build/gen_snapshot
+          if-no-files-found: error
+
   windows-build:
     runs-on: windows-latest
 

engine/src/flutter/ci/tizen/build_llvm.sh

@@ -43,4 +43,5 @@ for name in ar readelf nm strip; do
   ln -sf llvm-$name arm-linux-gnueabi-$name
   ln -sf llvm-$name aarch64-linux-gnu-$name
   ln -sf llvm-$name i686-linux-gnu-$name
+  ln -sf llvm-$name x86_64-linux-gnu-$name
 done

engine/src/flutter/ci/tizen/generate_sysroot.py

@@ -32,20 +32,26 @@
 
 
 def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
+  target = 'standard'
+
   if arch == 'arm':
     tizen_arch = 'armv7l'
   elif arch == 'arm64':
     tizen_arch = 'aarch64'
   elif arch == 'x86':
     tizen_arch = 'i686'
+    target = 'emulator'
+  elif arch == 'x64':
+    tizen_arch = 'x86_64'
+    target = 'emulator'
   else:
     sys.exit('Unknown arch: ' + arch)
 
   base_repo = 'http://download.tizen.org/snapshots/TIZEN/Tizen-{}/Tizen-{}-Base/latest/repos/standard/packages'.format(
       api_version, api_version
   )
-  unified_repo = 'http://download.tizen.org/snapshots/TIZEN/Tizen-{}/Tizen-{}-Unified/latest/repos/standard/packages'.format(
-      api_version, api_version
+  unified_repo = 'http://download.tizen.org/snapshots/TIZEN/Tizen-{}/Tizen-{}-Unified/latest/repos/{}/packages'.format(
+      api_version, api_version, target
   )
 
   # Retrieve html documents.
@@ -91,11 +97,11 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
   if not asm.exists():
     os.symlink('asm-' + arch, asm)
   pkgconfig = sysroot / 'usr' / 'lib' / 'pkgconfig'
-  if arch == 'arm64' and not pkgconfig.exists():
+  if (arch == 'arm64' or arch == 'x64') and not pkgconfig.exists():
     os.symlink('../lib64/pkgconfig', pkgconfig)
 
   # Copy objects required by the linker, such as crtbeginS.o and libgcc.a.
-  if arch == 'arm64':
+  if arch == 'arm64' or arch == 'x64':
     libpath = sysroot / 'usr' / 'lib64'
   else:
     libpath = sysroot / 'usr' / 'lib'
@@ -135,7 +141,13 @@ def main():
     outpath = Path(__file__).parent / 'sysroot'
   outpath.mkdir(exist_ok=True)
 
-  for arch in ['arm', 'arm64', 'x86']:
+  arches = ['arm', 'arm64', 'x86']
+  if args.api_version >= 10.0:
+    arches = ['arm', 'arm64', 'x64']
+  elif args.api_version >= 8.0:
+    arches = ['arm', 'arm64', 'x86', 'x64']
+
+  for arch in arches:
     sysroot = outpath / arch
     if args.force and sysroot.is_dir():
       shutil.rmtree(sysroot)

engine/src/flutter/testing/testing.gni

@@ -14,7 +14,7 @@ is_aot_test =
 # * is_mac: arm64 builds can run x64 binaries.
 # * is_fuchsia: build unittests for testing on device.
 declare_args() {
-  enable_unittests = current_toolchain == host_toolchain || is_fuchsia || is_mac
+  enable_unittests = false # current_toolchain == host_toolchain || is_fuchsia || is_mac
 }
 
 # Creates a translation unit that defines the flutter::testing::GetFixturesPath