mirror of
git://f0xx.org/ac/ac-scripts
synced 2026-08-09 20:59:09 +03:00
CI: put Android SDK cmake on PATH for native codec builds.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -23,7 +23,7 @@ RUN mkdir -p "${ANDROID_HOME}/cmdline-tools" \
|
|||||||
&& mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${ANDROID_HOME}/cmdline-tools/latest" \
|
&& mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${ANDROID_HOME}/cmdline-tools/latest" \
|
||||||
&& rm /tmp/cmdline-tools.zip
|
&& rm /tmp/cmdline-tools.zip
|
||||||
|
|
||||||
ENV PATH="${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}"
|
ENV PATH="${ANDROID_HOME}/cmake/3.22.1/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}"
|
||||||
|
|
||||||
RUN yes | sdkmanager --licenses >/dev/null \
|
RUN yes | sdkmanager --licenses >/dev/null \
|
||||||
&& sdkmanager --install \
|
&& sdkmanager --install \
|
||||||
|
|||||||
@@ -67,6 +67,12 @@ fi
|
|||||||
source "$ROOT/scripts/android-ndk.sh"
|
source "$ROOT/scripts/android-ndk.sh"
|
||||||
export ANDROID_NDK_HOME="$(androidcast_find_ndk_root "$ROOT")"
|
export ANDROID_NDK_HOME="$(androidcast_find_ndk_root "$ROOT")"
|
||||||
export ANDROID_NDK_ROOT="$ANDROID_NDK_HOME"
|
export ANDROID_NDK_ROOT="$ANDROID_NDK_HOME"
|
||||||
|
if [[ -n "${ANDROID_SDK_ROOT:-}" ]]; then
|
||||||
|
_cmake_bin="$(find "${ANDROID_SDK_ROOT}/cmake" -path '*/bin/cmake' 2>/dev/null | head -1)"
|
||||||
|
if [[ -n "$_cmake_bin" ]]; then
|
||||||
|
export PATH="$(dirname "$_cmake_bin"):${PATH}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
if [[ -n "${ANDROID_SDK_ROOT:-}" ]]; then
|
if [[ -n "${ANDROID_SDK_ROOT:-}" ]]; then
|
||||||
LOCAL_PROPS="$ROOT/local.properties"
|
LOCAL_PROPS="$ROOT/local.properties"
|
||||||
LOCAL_PROPS_BACKUP=""
|
LOCAL_PROPS_BACKUP=""
|
||||||
|
|||||||
Reference in New Issue
Block a user