Skip to content

Commit 69eeac1

Browse files
committed
env/android-amd64-emu: add ANDROID_SDK_ROOT
ANDROID_HOME is deprecated. golang.org/cl/244057 is replacing it with ANDROID_SDK_ROOT, and we need the builder to use the new environment variable. After the change is submitted and gomobile is updated, we will need another clean up cl to delete ANDROID_HOME. Updates golang/go#39945 Change-Id: I1f06cead94fbf5cd3c1ca1d8c6c68b2a219898eb Reviewed-on: https://go-review.googlesource.com/c/build/+/247357 Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 2519607 commit 69eeac1

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

env/android-amd64-emu/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ ENV DEBIAN_FRONTEND noninteractive
1212
ENV GO_BUILDER_ENV android-amd64-emu
1313

1414
# For gomobile tests
15-
ENV ANDROID_HOME=/android/sdk
15+
ENV ANDROID_SDK_ROOT=/android/sdk
16+
# TODO(golang.org/issues/39945): delete the use of ANDROID_HOME after cl/244057 lands.
17+
ENV ANDROID_HOME=${ANDROID_SDK_ROOT}
1618
ENV CGO_CFLAGS=-I/android/openal-headers
1719

18-
ENV PATH="${PATH}:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/build-tools/27.0.3:/android/gradle/bin"
20+
ENV PATH="${PATH}:${ANDROID_SDK_ROOT}/platform-tools:${ANDROID_SDK_ROOT}/build-tools/27.0.3:/android/gradle/bin"
1921
ENV CC_FOR_android_386=/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android26-clang
2022
ENV CC_FOR_android_amd64=/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android26-clang
2123

0 commit comments

Comments
 (0)