@@ -229,14 +229,6 @@ sed -i \
229229 -e ' s/max_wait_seconds=600/max_wait_seconds=1800/' \
230230 mobile/android/gradle.py
231231
232- # to get following url: adjust python/mozbuild/mozbuild/artifact_cache.py
233- # then: ./mach --no-interactive bootstrap --application-choice="GeckoView/Firefox for Android"
234- # and: rm -rfv ~/.mozbuild
235- rm -rf clang clang.tar.zst
236- wget --continue " https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EeNUActmRxmkbsgTIruqeQ/artifacts/public/build/clang.tar.zst"
237- echo " b98c78745ff8124d76df43a3b569c3d6d87cbd76d11d0e823b2f58643f5fc35b clang.tar.zst" | sha256sum -c
238- tar -xvf clang.tar.zst
239-
240232# Configure
241233sed -i -e ' /check_android_tools("emulator"/d' build/moz.configure/android-sdk.configure
242234cat << EOF > mozconfig
@@ -258,13 +250,13 @@ ac_add_options --enable-strip
258250ac_add_options --target=$target
259251ac_add_options --with-android-ndk="$ANDROID_NDK "
260252ac_add_options --with-android-sdk="$ANDROID_SDK "
261- ac_add_options --with-libclang-path="$mozilla_release /clang/lib "
253+ ac_add_options --with-libclang-path="/usr/lib64 "
262254ac_add_options --with-java-bin-path="/usr/bin"
263255ac_add_options --with-gradle=$( command -v gradle)
264256ac_add_options --with-wasi-sysroot="$wasi /build/install/wasi/share/wasi-sysroot"
265- ac_add_options CC=" $mozilla_release / clang/bin/clang"
266- ac_add_options CXX=" $mozilla_release / clang/bin/clang++"
267- ac_add_options STRIP=" $mozilla_release /clang/bin/ llvm-strip"
257+ ac_add_options CC=$( command -v clang)
258+ ac_add_options CXX=$( command -v clang++ )
259+ ac_add_options STRIP=$( command -v llvm-strip)
268260ac_add_options WASM_CC="$wasi /build/install/wasi/bin/clang"
269261ac_add_options WASM_CXX="$wasi /build/install/wasi/bin/clang++"
270262mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj
0 commit comments