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 <dmitshur@golang.org>
diff --git a/env/android-amd64-emu/Dockerfile b/env/android-amd64-emu/Dockerfile
index e3b4c42..8feae85 100644
--- a/env/android-amd64-emu/Dockerfile
+++ b/env/android-amd64-emu/Dockerfile
@@ -12,10 +12,12 @@
ENV GO_BUILDER_ENV android-amd64-emu
# For gomobile tests
-ENV ANDROID_HOME=/android/sdk
+ENV ANDROID_SDK_ROOT=/android/sdk
+# TODO(golang.org/issues/39945): delete the use of ANDROID_HOME after cl/244057 lands.
+ENV ANDROID_HOME=${ANDROID_SDK_ROOT}
ENV CGO_CFLAGS=-I/android/openal-headers
-ENV PATH="${PATH}:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/build-tools/27.0.3:/android/gradle/bin"
+ENV PATH="${PATH}:${ANDROID_SDK_ROOT}/platform-tools:${ANDROID_SDK_ROOT}/build-tools/27.0.3:/android/gradle/bin"
ENV CC_FOR_android_386=/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android26-clang
ENV CC_FOR_android_amd64=/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android26-clang
