From 1549aaf48133dadcb3c2c1e2731a3d6dc8986eef Mon Sep 17 00:00:00 2001
From: Justin Boswell <boswej@amazon.com>
Date: Thu, 2 Apr 2020 17:24:08 -0700
Subject: [PATCH] Android support (#108)

* Enabled s2n on android

* Added android-armv7 CI

* Updated to builder v0.6.1

* updated http to v0.5.2

* Updated s2n to 57147b6c99183c8b1e27068b53ce079eebc106cd
---
 .github/workflows/ci.yml        | 11 ++++++-----
 aws-common-runtime/aws-c-common |  2 +-
 aws-common-runtime/aws-c-http   |  2 +-
 aws-common-runtime/s2n          |  2 +-
 builder.json                    |  7 ++++++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b14a8b35c..9ce89efe4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,8 @@ on:
       - '!master'
 
 env:
-  BUILDER_VERSION: v0.5.9
+  BUILDER_VERSION: v0.6.1
+  BUILDER_SOURCE: releases
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
   PACKAGE_NAME: aws-crt-cpp
   LINUX_BASE_IMAGE: ubuntu-16-x64
@@ -74,7 +75,7 @@ jobs:
     steps:
     - name: Build ${{ env.PACKAGE_NAME }} + consumers
       run: |
-        python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
+        python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
         python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
 
   osx:
@@ -82,7 +83,7 @@ jobs:
     steps:
     - name: Build ${{ env.PACKAGE_NAME }} + consumers
       run: |
-        python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
+        python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
         chmod a+x builder
         ./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
 
@@ -91,12 +92,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        arch: [linux-armv6, linux-armv7, linux-arm64]
+        arch: [linux-armv6, linux-armv7, linux-arm64, android-armv7]
   
     steps:
     - name: Build ${{ env.PACKAGE_NAME }} + consumers
       run: |
-        python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
+        python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
         chmod a+x builder
         ./builder build -p aws-crt-cpp --spec=downstream --target=${{matrix.arch}}
 
diff --git a/aws-common-runtime/aws-c-common b/aws-common-runtime/aws-c-common
index 6f0787f0c..8c7e4ba47 160000
--- a/aws-common-runtime/aws-c-common
+++ b/aws-common-runtime/aws-c-common
@@ -1 +1 @@
-Subproject commit 6f0787f0c567326a5313188af7cb3b4dbfef1a24
+Subproject commit 8c7e4ba47ca6626d6148b49eef87db502859b4b4
diff --git a/aws-common-runtime/aws-c-http b/aws-common-runtime/aws-c-http
index f5096cab2..d0c3a076c 160000
--- a/aws-common-runtime/aws-c-http
+++ b/aws-common-runtime/aws-c-http
@@ -1 +1 @@
-Subproject commit f5096cab294d201bc4a217ed5679f912baa14684
+Subproject commit d0c3a076c849b7079b74b2bcd69df4716c6bbc07
diff --git a/aws-common-runtime/s2n b/aws-common-runtime/s2n
index bffd9b768..57147b6c9 160000
--- a/aws-common-runtime/s2n
+++ b/aws-common-runtime/s2n
@@ -1 +1 @@
-Subproject commit bffd9b768d6051bce4badfed1ee73bd983c2b260
+Subproject commit 57147b6c99183c8b1e27068b53ce079eebc106cd
diff --git a/builder.json b/builder.json
index e454f0d09..8e328a4a0 100644
--- a/builder.json
+++ b/builder.json
@@ -10,6 +10,11 @@
             "imports": [
                 "s2n"
             ]
+        },
+        "android": {
+            "imports": [
+                "s2n"
+            ]
         }
     },
     "search_dirs": ["aws-common-runtime"],
@@ -22,4 +27,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}