From 030babd8f10c8e9431b8e675ac7ed25b992bba91 Mon Sep 17 00:00:00 2001
From: uazo <uazo@users.noreply.github.com>
Date: Tue, 17 Aug 2021 09:41:16 +0000
Subject: [PATCH] add x86_64 android image

---
 images/bromite-build/Dockerfile               |  2 ++
 images/bromite-build/generic_android31.textpb | 25 +++++++++++++++++++
 images/bromite-build/pre-start.sh             |  5 +++-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 images/bromite-build/generic_android31.textpb

diff --git a/images/bromite-build/Dockerfile b/images/bromite-build/Dockerfile
index ee5f3d9..6d8f8b5 100644
--- a/images/bromite-build/Dockerfile
+++ b/images/bromite-build/Dockerfile
@@ -11,6 +11,8 @@ COPY goma_auth.py .
 COPY casupload .
 COPY build_args.gni .
 
+COPY generic_android31.textpb .
+
 ENV CIPD_CACHE_DIR=/home/lg/working_dir/.cipd_cache
 
 RUN sudo chmod +x ./start-build.sh \
diff --git a/images/bromite-build/generic_android31.textpb b/images/bromite-build/generic_android31.textpb
new file mode 100644
index 0000000..0c36551
--- /dev/null
+++ b/images/bromite-build/generic_android31.textpb
@@ -0,0 +1,25 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Configuration for a generic x86_64 android-12 AVD (userdebug build).
+
+emulator_package {
+  package_name: "chromium/third_party/android_sdk/public/emulator"
+  version: "gMHhUuoQRKfxr-MBn3fNNXZtkAVXtOwMwT7kfx8jkIgC"  # 30.7.5
+  dest_path: ".emulator_sdk"
+}
+
+system_image_package {
+  package_name: "chromium/third_party/android_sdk/public/system-images/android-31/google_apis/x86_64"
+  version: "R6Jh5_P21Euu-kdb11zcNjdJKN4vV1mdQTb8t4gph4IC"  # 6
+  dest_path: ".emulator_sdk"
+}
+system_image_name: "system-images;android-31;google_apis;x86_64"
+
+avd_package {
+  package_name: "chromium/third_party/android_sdk/public/avds/android-31/google_apis/x86_64"
+  version: "Ur_zl6_BRKRkf_9X3SMZ3eH2auoOyJ2kLslpTZZwi3gC"  # created in bb_id 8841388797862621664
+  dest_path: ".android"
+}
+avd_name: "android_31_google_apis_x86_64"
diff --git a/images/bromite-build/pre-start.sh b/images/bromite-build/pre-start.sh
index 26cf87a..94f0dac 100644
--- a/images/bromite-build/pre-start.sh
+++ b/images/bromite-build/pre-start.sh
@@ -23,7 +23,10 @@ cipd install infra/goma/client/linux-amd64 -root $WORKSPACE/goma
 echo "nomatter" >$WORKSPACE/.debug_auth_file
 sudo cp $WORKSPACE/goma_auth.py $WORKSPACE/goma/
 
-echo -e ${RED} -------- prepare vpython virtual environment
+echo -e ${RED} -------- prepare vpython virtual environment ${NC}
 rm -rf /tmp/vpython*
 cd $WORKSPACE/chromium/src
 vpython -vpython-spec .vpython -vpython-root . -vpython-log-level debug -vpython-tool install
+
+echo -e ${RED} -------- download x86_64 android image ${NC}
+echo -e "\$ParanoidMode CheckIntegrity\n\nchromium/third_party/android_sdk/public/avds/android-31/google_apis/x86_64 Ur_zl6_BRKRkf_9X3SMZ3eH2auoOyJ2kLslpTZZwi3gC" | .cipd_client ensure -ensure-file - -root chromium/src/.android