Ryan VanderMeulen
714d1f97e1
The macOS Android toolchains (JDK, SDK, arm64 AVD and arm64 system images) only download and repack upstream archives, so they don't need a macOS worker. The JDK is downloaded for macOS/arm64 via new --os-name/--os-arch overrides for android.py --jdk-only. sdkmanager selects packages by matching the host OS and CPU architecture, so downloading the macOS/arm64 packages from this Linux/x86_64 host needs both REPO_OS_OVERRIDE=macosx and -Dos.arch=aarch64. The AVD prewarm was already a no-op because arm64.json sets emulator_prewarm to false, and system images are host-independent, so neither of those two repacks needs either override. They were also in the TL Treeherder group despite targeting macOS arm64; move them to TMA64 to match the other cross-built toolchains. Differential Revision: https://phabricator.services.mozilla.com/D325154
24 lines
726 B
Bash
Executable File
24 lines
726 B
Bash
Executable File
#!/bin/bash
|
|
set -x -e -v
|
|
|
|
# This script is for fetching and repacking the Android SDK (for macOS),
|
|
# the tools required to produce Android packages.
|
|
|
|
mkdir -p $UPLOAD_DIR
|
|
|
|
rm -rf /builds/worker/.mozbuild/jdk
|
|
cp -rp $MOZ_FETCHES_DIR/jdk /builds/worker/.mozbuild/
|
|
|
|
export REPO_OS_OVERRIDE=macosx
|
|
export JAVA_TOOL_OPTIONS=-Dos.arch=aarch64
|
|
|
|
# Populate /builds/worker/.mozbuild/android-sdk-linux.
|
|
cd $GECKO_PATH
|
|
./mach python python/mozboot/mozboot/android.py --artifact-mode --no-interactive --list-packages
|
|
|
|
mv /builds/worker/.mozbuild/android-sdk-linux /builds/worker/.mozbuild/android-sdk-macosx
|
|
|
|
tar cavf $UPLOAD_DIR/android-sdk-macos.tar.zst -C /builds/worker/.mozbuild android-sdk-macosx bundletool.jar
|
|
|
|
ls -al $UPLOAD_DIR
|