From dd9764c70f35e48a6d2f4b992fd04c7adffb5653 Mon Sep 17 00:00:00 2001
From: Austin Hsieh <austinhsieh@google.com>
Date: Wed, 3 Nov 2021 03:17:00 +0000
Subject: [PATCH 1/2] Add script for android-emulator Docker build/push.

---
 .../helpers/cirque_android_docker_build.sh    | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100755 scripts/helpers/cirque_android_docker_build.sh

diff --git a/scripts/helpers/cirque_android_docker_build.sh b/scripts/helpers/cirque_android_docker_build.sh
new file mode 100755
index 00000000000000..3f98c4aeab1a7c
--- /dev/null
+++ b/scripts/helpers/cirque_android_docker_build.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+#
+# Copyright (c) 2021 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# cirque_android_docker_build.sh - utility for building and (optionally)
+#                        pushing the Cirque Android Emulator Docker image.
+#
+# Example usage:
+# $ ./cirque_android_docker_build.sh --push
+#
+
+set -ex
+
+CHIP_ROOT="$(dirname "$0")/../.."
+CIRQUE_RESOURCES=$CHIP_ROOT/third_party/cirque/repo/cirque/resources
+
+ORG=connectedhomeip
+IMAGE=android-emulator
+TAG=latest
+ARGS=()
+
+usage() {
+    echo "Usage: $0 [--tag <tag> --push]" >&2
+    exit 0
+}
+
+while (($#)); do
+    case "$1" in
+        --tag)
+            TAG="$2"
+            shift
+            ;;
+        --push) ARGS+=("--push") ;;
+        --help) usage ;;
+    esac
+    shift
+done
+
+docker buildx build -t "$ORG/$IMAGE:$TAG" -f $CIRQUE_RESOURCES/Dockerfile.android_emulator "${ARGS[@]}" $CIRQUE_RESOURCES

From 3a977c3582027b7f9dfaf751cec6b7125c7bad2b Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Wed, 3 Nov 2021 19:15:51 +0000
Subject: [PATCH 2/2] Restyled by shellharden

---
 scripts/helpers/cirque_android_docker_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/helpers/cirque_android_docker_build.sh b/scripts/helpers/cirque_android_docker_build.sh
index 3f98c4aeab1a7c..0cafbe40700d53 100755
--- a/scripts/helpers/cirque_android_docker_build.sh
+++ b/scripts/helpers/cirque_android_docker_build.sh
@@ -50,4 +50,4 @@ while (($#)); do
     shift
 done
 
-docker buildx build -t "$ORG/$IMAGE:$TAG" -f $CIRQUE_RESOURCES/Dockerfile.android_emulator "${ARGS[@]}" $CIRQUE_RESOURCES
+docker buildx build -t "$ORG/$IMAGE:$TAG" -f "$CIRQUE_RESOURCES"/Dockerfile.android_emulator "${ARGS[@]}" "$CIRQUE_RESOURCES"