try with LLVM on host

mukilan · Dec 2, 2023 · 6814ac5 · 6814ac5
1 parent 2956f1d
commit 6814ac5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -71,6 +71,8 @@ jobs:
         run: sudo apt update && python3 ./mach bootstrap
       # - name: Tidy
       #   run: python3 ./mach test-tidy --no-progress --all
+      - name: Set LIBCLANG_PATH env # needed for bindgen in mozangle
+        run: echo "LIBCLANG_PATH=/usr/lib/llvm-14/lib" >> $GITHUB_ENV
       - name: Release build (${{ matrix.arch }} ${{ inputs.production && 'without' || 'with' }} debug assertions)
         run: |
           export JAVA_HOME="${JAVA_HOME_17_X64}"

diff --git a/python/servo/command_base.py b/python/servo/command_base.py
@@ -680,10 +680,10 @@ def build_android_env_if_needed(self, env: Dict[str, str]):
         env['OBJCOPY'] = to_ndk_bin("llvm-objcopy")
         env['YASM'] = to_ndk_bin("yasm")
         env['STRIP'] = to_ndk_bin("llvm-strip")
-        env['LLVM_CONFIG_PATH'] = to_ndk_bin("llvm-config")
+        #env['LLVM_CONFIG_PATH'] = to_ndk_bin("llvm-config")
         env['HARFBUZZ_SYS_NO_PKG_CONFIG'] = "true"
         env['RUST_FONTCONFIG_DLOPEN'] = "on"
-        env["BINDGEN_EXTRA_CLANG_ARGS"] =  f"--sysroot={env['ANDROID_SYSROOT']} -I{arch_include}"
+        #env["BINDGEN_EXTRA_CLANG_ARGS"] =  f"--sysroot={env['ANDROID_SYSROOT']} -I{arch_include}"
         # A cheat-sheet for some of the build errors caused by getting the search path wrong...
         #
         # fatal error: 'limits' file not found