fix(android): auto-discover SDK/NDK in build script, strip native libs
build_android_apk.sh no longer requires all four env vars to be set manually. It probes common SDK paths and uses the newest installed build-tools/NDK/platform when vars are absent. Also adds llvm-strip pass to strip debug symbols from .so files before packaging (controlled by STRIP_NATIVE_LIBS, default 1), moves the debug keystore to a stable target/android/debug.keystore path, and prints resolved paths at start. Also adds scripts/ANDROID_TESTING.md and scripts/android_smoke.sh for on-device smoke testing. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
funman300
@@ -6,11 +6,15 @@
|
||||
# ndk-build crate that we couldn't isolate; running each Android toolchain
|
||||
# step explicitly gives us a debuggable pipeline.
|
||||
#
|
||||
# Required environment:
|
||||
# ANDROID_HOME Path to Android SDK root
|
||||
# ANDROID_NDK_HOME Path to the specific NDK version
|
||||
# BUILD_TOOLS_VERSION e.g. "34.0.0"
|
||||
# PLATFORM e.g. "android-34"
|
||||
# Environment:
|
||||
# ANDROID_HOME Path to Android SDK root. If unset, common SDK
|
||||
# locations such as ~/Android/Sdk are tried.
|
||||
# ANDROID_NDK_HOME Path to the specific NDK version. If unset, the
|
||||
# newest $ANDROID_HOME/ndk/* directory is used.
|
||||
# BUILD_TOOLS_VERSION e.g. "34.0.0". If unset, newest installed build-tools
|
||||
# version is used.
|
||||
# PLATFORM e.g. "android-34". If unset, newest installed
|
||||
# $ANDROID_HOME/platforms/android-* platform is used.
|
||||
#
|
||||
# Optional environment:
|
||||
# PROFILE "debug" (default) | "release"
|
||||
@@ -19,7 +23,8 @@
|
||||
# fit the runner's disk budget — a full three-ABI
|
||||
# debug build can exceed 25 GB of target/ output.
|
||||
# APK_OUT Output APK path (default: target/$PROFILE/apk/ferrous-solitaire.apk)
|
||||
# KEYSTORE Path to keystore for signing (default: generates a debug keystore)
|
||||
# STRIP_NATIVE_LIBS 1 to strip .so files before packaging (default: 1)
|
||||
# KEYSTORE Path to keystore for signing (default: target/android/debug.keystore)
|
||||
# KEYSTORE_PASS Keystore password (default: "android" for the generated debug keystore)
|
||||
# KEY_ALIAS Key alias (default: "androiddebugkey")
|
||||
# KEY_PASS Key password (default: same as KEYSTORE_PASS)
|
||||
@@ -28,18 +33,63 @@
|
||||
# $APK_OUT Signed, zipaligned APK
|
||||
set -euo pipefail
|
||||
|
||||
: "${ANDROID_HOME:?ANDROID_HOME must be set}"
|
||||
: "${ANDROID_NDK_HOME:?ANDROID_NDK_HOME must be set}"
|
||||
: "${BUILD_TOOLS_VERSION:?BUILD_TOOLS_VERSION must be set}"
|
||||
: "${PLATFORM:?PLATFORM must be set (e.g. android-34)}"
|
||||
infer_latest_dir_name() {
|
||||
local pattern="$1"
|
||||
local latest=""
|
||||
shopt -s nullglob
|
||||
local dirs=( $pattern )
|
||||
shopt -u nullglob
|
||||
if [ ${#dirs[@]} -gt 0 ]; then
|
||||
latest="$(printf '%s\n' "${dirs[@]}" | sort -V | tail -n 1)"
|
||||
basename "$latest"
|
||||
fi
|
||||
}
|
||||
|
||||
if [ -z "${ANDROID_HOME:-}" ]; then
|
||||
for candidate in "$HOME/Android/Sdk" "$HOME/Library/Android/sdk" "/opt/android-sdk" "/usr/lib/android-sdk"; do
|
||||
if [ -d "$candidate" ]; then
|
||||
ANDROID_HOME="$candidate"
|
||||
export ANDROID_HOME
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
: "${ANDROID_HOME:?ANDROID_HOME must be set or discoverable under a common SDK path}"
|
||||
|
||||
if [ -z "${ANDROID_NDK_HOME:-}" ]; then
|
||||
NDK_VERSION="$(infer_latest_dir_name "$ANDROID_HOME/ndk/*")"
|
||||
if [ -n "$NDK_VERSION" ]; then
|
||||
ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$NDK_VERSION"
|
||||
export ANDROID_NDK_HOME
|
||||
fi
|
||||
fi
|
||||
: "${ANDROID_NDK_HOME:?ANDROID_NDK_HOME must be set or discoverable under ANDROID_HOME/ndk}"
|
||||
|
||||
if [ -z "${BUILD_TOOLS_VERSION:-}" ]; then
|
||||
BUILD_TOOLS_VERSION="$(infer_latest_dir_name "$ANDROID_HOME/build-tools/*")"
|
||||
export BUILD_TOOLS_VERSION
|
||||
fi
|
||||
: "${BUILD_TOOLS_VERSION:?BUILD_TOOLS_VERSION must be set or discoverable under ANDROID_HOME/build-tools}"
|
||||
|
||||
if [ -z "${PLATFORM:-}" ]; then
|
||||
PLATFORM="$(infer_latest_dir_name "$ANDROID_HOME/platforms/android-*")"
|
||||
export PLATFORM
|
||||
fi
|
||||
: "${PLATFORM:?PLATFORM must be set or discoverable under ANDROID_HOME/platforms}"
|
||||
|
||||
PROFILE="${PROFILE:-debug}"
|
||||
ABIS="${ABIS:-arm64-v8a armeabi-v7a x86_64}"
|
||||
APK_OUT="${APK_OUT:-target/${PROFILE}/apk/ferrous-solitaire.apk}"
|
||||
STRIP_NATIVE_LIBS="${STRIP_NATIVE_LIBS:-1}"
|
||||
|
||||
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$REPO_ROOT"
|
||||
|
||||
echo ">>> Android SDK: $ANDROID_HOME"
|
||||
echo ">>> Android NDK: $ANDROID_NDK_HOME"
|
||||
echo ">>> Build tools: $BUILD_TOOLS_VERSION"
|
||||
echo ">>> Platform: $PLATFORM"
|
||||
|
||||
BT="$ANDROID_HOME/build-tools/$BUILD_TOOLS_VERSION"
|
||||
PLATFORM_JAR="$ANDROID_HOME/platforms/$PLATFORM/android.jar"
|
||||
MANIFEST="solitaire_app/android/AndroidManifest.xml"
|
||||
@@ -69,6 +119,24 @@ fi
|
||||
echo ">>> cargo ndk ${CARGO_NDK_ARGS[*]}"
|
||||
cargo ndk "${CARGO_NDK_ARGS[@]}"
|
||||
|
||||
if [ "$STRIP_NATIVE_LIBS" = "1" ]; then
|
||||
LLVM_STRIP=""
|
||||
shopt -s nullglob
|
||||
STRIP_CANDIDATES=( "$ANDROID_NDK_HOME"/toolchains/llvm/prebuilt/*/bin/llvm-strip )
|
||||
shopt -u nullglob
|
||||
if [ ${#STRIP_CANDIDATES[@]} -gt 0 ]; then
|
||||
LLVM_STRIP="${STRIP_CANDIDATES[0]}"
|
||||
fi
|
||||
if [ -z "$LLVM_STRIP" ]; then
|
||||
echo "llvm-strip not found under ANDROID_NDK_HOME; native libraries will remain unstripped" >&2
|
||||
else
|
||||
echo ">>> strip native libraries with $LLVM_STRIP"
|
||||
find "$STAGING/lib" -name '*.so' -print0 | while IFS= read -r -d '' so; do
|
||||
"$LLVM_STRIP" --strip-debug "$so"
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
# --- 2. compile + link resources and manifest ------------------------------
|
||||
if [ -d "$RES_DIR" ]; then
|
||||
echo ">>> aapt2 compile resources"
|
||||
@@ -120,11 +188,15 @@ rm -f "$STAGING/app-unsigned.apk"
|
||||
|
||||
# --- 5. sign ---------------------------------------------------------------
|
||||
if [ -z "${KEYSTORE:-}" ]; then
|
||||
# Generate a deterministic debug keystore on the fly.
|
||||
KEYSTORE="$STAGING/debug.keystore"
|
||||
KEYSTORE_PASS="${KEYSTORE_PASS:-android}"
|
||||
KEY_ALIAS="${KEY_ALIAS:-androiddebugkey}"
|
||||
KEY_PASS="${KEY_PASS:-$KEYSTORE_PASS}"
|
||||
KEYSTORE="target/android/debug.keystore"
|
||||
fi
|
||||
|
||||
KEYSTORE_PASS="${KEYSTORE_PASS:-android}"
|
||||
KEY_ALIAS="${KEY_ALIAS:-androiddebugkey}"
|
||||
KEY_PASS="${KEY_PASS:-$KEYSTORE_PASS}"
|
||||
|
||||
if [ ! -f "$KEYSTORE" ]; then
|
||||
mkdir -p "$(dirname "$KEYSTORE")"
|
||||
echo ">>> generating debug keystore at $KEYSTORE"
|
||||
keytool -genkeypair -v \
|
||||
-keystore "$KEYSTORE" \
|
||||
|
||||
Reference in New Issue
Block a user