From fe5e5d753f31f167b5de8a5335776512565072d4 Mon Sep 17 00:00:00 2001
From: Kyle Manna <kyle@kylemanna.com>
Date: Wed, 12 Oct 2016 17:39:48 -0700
Subject: [PATCH] marshmallow: Test on marshmallow android-6.0.1_r72

* Works as expected.
---
 README.md                  |  2 ++
 tests/build-marshmallow.sh | 55 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100755 tests/build-marshmallow.sh

diff --git a/README.md b/README.md
index 6b78268..c24c831 100644
--- a/README.md
+++ b/README.md
@@ -77,3 +77,5 @@ Tested
 ------
 
 * Android Kitkat `android-4.4.4_r2.0.1`
+* Android Lollipop `android-5.0.2_r1`
+* Android Marshmallow `android-6.0.1_r72`
diff --git a/tests/build-marshmallow.sh b/tests/build-marshmallow.sh
new file mode 100755
index 0000000..7507097
--- /dev/null
+++ b/tests/build-marshmallow.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+# Test script file that maps itself into a docker container and runs
+#
+# Example invocation:
+#
+# $ AOSP_VOL=$PWD/build ./build-marshmallow.sh
+#
+set -ex
+
+if [ "$1" = "docker" ]; then
+    TEST_BRANCH=${TEST_BRANCH:-android-6.0.1_r72}
+    TEST_URL=${TEST_URL:-https://android.googlesource.com/platform/manifest}
+
+    cpus=$(grep ^processor /proc/cpuinfo | wc -l)
+
+    repo init --depth 1 -u "$TEST_URL" -b "$TEST_BRANCH"
+
+    # Use default sync '-j' value embedded in manifest file to be polite
+    repo sync
+
+    prebuilts/misc/linux-x86/ccache/ccache -M 10G
+
+    source build/envsetup.sh
+    lunch aosp_arm-eng
+    make -j $cpus
+else
+    aosp_url="https://raw.githubusercontent.com/kylemanna/docker-aosp/master/utils/aosp"
+    args="bash run.sh docker"
+    export AOSP_EXTRA_ARGS="-v $(cd $(dirname $0) && pwd -P)/$(basename $0):/usr/local/bin/run.sh:ro"
+    export AOSP_IMAGE="kylemanna/aosp:6.0-marshmallow"
+
+    #
+    # Try to invoke the aosp wrapper with the following priority:
+    #
+    # 1. If AOSP_BIN is set, use that
+    # 2. If aosp is found in the shell $PATH
+    # 3. Grab it from the web
+    #
+    if [ -n "$AOSP_BIN" ]; then
+        $AOSP_BIN $args
+    elif [ -x "../utils/aosp" ]; then
+        ../utils/aosp $args
+    elif [ -n "$(type -P aosp)" ]; then
+        aosp $args
+    else
+        if [ -n "$(type -P curl)" ]; then
+            bash <(curl -s $aosp_url) $args
+        elif [ -n "$(type -P wget)" ]; then
+            bash <(wget -q $aosp_url -O -) $args
+        else
+            echo "Unable to run the aosp binary"
+        fi
+    fi
+fi