From 9988eab044ec68d223bf0a35916be4aa491903c4 Mon Sep 17 00:00:00 2001
From: Oscar Vestlie <oxv@google.com>
Date: Tue, 24 Sep 2024 03:20:05 +0200
Subject: [PATCH] Implement DinD on internal CI (#4149)

b/360901490
---
 docker-compose.yml              | 28 ++++++++++++++++++++++++++++
 docker/linux/android/Dockerfile |  1 +
 2 files changed, 29 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0aaf23c431b10..3c2a5589f0e11 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -278,6 +278,19 @@ services:
       CONFIG: ${CONFIG:-debug}
       TARGET_CPU: ${TARGET_CPU:-arm64}
 
+  # Defined common build image for android-evergreen
+  build-android-evergreen:
+    <<: *build-common-definitions
+    build:
+      context: ./docker/linux
+      dockerfile: android/Dockerfile
+      args:
+        - FROM_IMAGE=cobalt-build-evergreen
+    image: cobalt-build-android-evergreen
+    depends_on: [ build-evergreen ]
+    environment:
+      <<: *shared-build-env
+
   build-raspi:
     <<: *build-common-definitions
     build:
@@ -432,6 +445,21 @@ services:
       CONFIG: ${CONFIG:-debug}
       SB_API_VERSION: 12
 
+  linux-x64x11-evergreen:
+    <<: *build-common-definitions
+    build:
+      context: ./docker/linux
+      dockerfile: linux-x64x11/Dockerfile
+      args:
+        - FROM_IMAGE=cobalt-build-evergreen
+    image: cobalt-build-linux-x64x11-evergreen
+    depends_on: [ build-evergreen ]
+    environment:
+      <<: *shared-build-env
+      PLATFORM: linux-x64x11
+      CONFIG: ${CONFIG:-debug}
+      SB_API_VERSION: ${SB_API_VERSION}
+
   # Example usage of unittest:
   # 1. Build the containers for which you want to unittest
   # docker-compose up --build --no-start linux-x64x11 unittest
diff --git a/docker/linux/android/Dockerfile b/docker/linux/android/Dockerfile
index 19bf4261e50d4..18d0981a2f8e2 100644
--- a/docker/linux/android/Dockerfile
+++ b/docker/linux/android/Dockerfile
@@ -19,6 +19,7 @@ RUN apt update -qqy \
     && apt install -qqy \
         libxml2-dev \
         default-jdk \
+        binutils-arm-linux-gnueabi \
         g++-multilib \
     && /opt/clean-after-apt.sh