Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit 1a28065

Browse files
Switch to Mozilla's prebuilt clang toolchain
Signed-off-by: Tavi <[email protected]>
1 parent 9797ce5 commit 1a28065

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

prebuild.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,14 @@ sed -i \
228228
-e 's/max_wait_seconds=600/max_wait_seconds=1800/' \
229229
mobile/android/gradle.py
230230

231+
# to get following url: adjust python/mozbuild/mozbuild/artifact_cache.py
232+
# then: ./mach --no-interactive bootstrap --application-choice="GeckoView/Firefox for Android"
233+
# and: rm -rfv ~/.mozbuild
234+
rm -rf clang clang.tar.zst
235+
wget --continue "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EeNUActmRxmkbsgTIruqeQ/artifacts/public/build/clang.tar.zst"
236+
echo "b98c78745ff8124d76df43a3b569c3d6d87cbd76d11d0e823b2f58643f5fc35b clang.tar.zst" | sha256sum -c
237+
tar -xvf clang.tar.zst
238+
231239
# Configure
232240
sed -i -e '/check_android_tools("emulator"/d' build/moz.configure/android-sdk.configure
233241
cat << EOF > mozconfig
@@ -249,12 +257,13 @@ ac_add_options --enable-strip
249257
ac_add_options --target=$target
250258
ac_add_options --with-android-ndk="$ANDROID_NDK"
251259
ac_add_options --with-android-sdk="$ANDROID_SDK"
260+
ac_add_options --with-libclang-path="$mozilla_release/clang/lib"
252261
ac_add_options --with-java-bin-path="/usr/bin"
253262
ac_add_options --with-gradle=$(command -v gradle)
254263
ac_add_options --with-wasi-sysroot="$wasi/build/install/wasi/share/wasi-sysroot"
255-
ac_add_options CC="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/clang"
256-
ac_add_options CXX="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++"
257-
ac_add_options STRIP="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip"
264+
ac_add_options CC="$mozilla_release/clang/bin/clang"
265+
ac_add_options CXX="$mozilla_release/clang/bin/clang++"
266+
ac_add_options STRIP="$mozilla_release/clang/bin/llvm-strip"
258267
ac_add_options WASM_CC="$wasi/build/install/wasi/bin/clang"
259268
ac_add_options WASM_CXX="$wasi/build/install/wasi/bin/clang++"
260269
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj

0 commit comments

Comments
 (0)