From 52c600fe9a6757c097b57b0e23b68d183f5ee4b8 Mon Sep 17 00:00:00 2001
From: Justin Smith <justsmth@amazon.com>
Date: Thu, 2 Jan 2025 10:29:32 -0500
Subject: [PATCH] Prepare aws-lc-sys v0.24.2

---
 .github/workflows/cross.yml                  | 39 +++++++++++---------
 .github/workflows/sys-bindings-generator.yml |  7 +++-
 aws-lc-sys/Cargo.toml                        |  4 +-
 aws-lc-sys/builder/main.rs                   |  1 +
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
index 318d7f0af97..40d568ddcda 100644
--- a/.github/workflows/cross.yml
+++ b/.github/workflows/cross.yml
@@ -27,23 +27,23 @@ jobs:
       fail-fast: false
       matrix:
         target:
-          - [aarch64-linux-android, 0]
-          - [aarch64-unknown-linux-gnu, 1]
-          - [aarch64-unknown-linux-musl, 1]
-          - [arm-linux-androideabi, 0]
-          - [arm-unknown-linux-gnueabihf, 0]
-          - [arm-unknown-linux-musleabi, 1]
-          - [arm-unknown-linux-musleabihf, 1]
-          - [armv7-linux-androideabi, 0]
-          - [armv7-unknown-linux-gnueabihf, 0]
-          - [i686-unknown-linux-gnu, 0]
-          - [powerpc-unknown-linux-gnu, 1]
-          - [powerpc64-unknown-linux-gnu, 1]
-          - [powerpc64le-unknown-linux-gnu, 1]
-          - [riscv64gc-unknown-linux-gnu, 0]
-          - [s390x-unknown-linux-gnu, 0]
-          - [x86_64-pc-windows-gnu, 0]
-          - [x86_64-unknown-linux-musl, 0]
+          - [ aarch64-linux-android, 0, 1 ]
+          - [ aarch64-unknown-linux-gnu, 1, 1 ]
+          - [ aarch64-unknown-linux-musl, 1, 1 ]
+          - [ arm-linux-androideabi, 0, 0 ]
+          - [ arm-unknown-linux-gnueabihf, 0, 0 ]
+          - [ arm-unknown-linux-musleabi, 1, 0 ]
+          - [ arm-unknown-linux-musleabihf, 1, 0 ]
+          - [ armv7-linux-androideabi, 0, 0 ]
+          - [ armv7-unknown-linux-gnueabihf, 0, 0 ]
+          - [ i686-unknown-linux-gnu, 0, 1 ]
+          - [ powerpc-unknown-linux-gnu, 1, 0 ]
+          - [ powerpc64-unknown-linux-gnu, 1, 0 ]
+          - [ powerpc64le-unknown-linux-gnu, 1, 0 ]
+          - [ riscv64gc-unknown-linux-gnu, 0, 0 ]
+          - [ s390x-unknown-linux-gnu, 0, 0 ]
+          - [ x86_64-pc-windows-gnu, 0, 1 ]
+          - [ x86_64-unknown-linux-musl, 0, 1 ]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -70,6 +70,9 @@ jobs:
       - if: ${{ !startsWith(matrix.target[0], 'x86_64') }}
         run: |
           echo 'AWS_LC_RS_DISABLE_SLOW_TESTS=1' >> "$GITHUB_ENV"
+      - if: ${{ matrix.target[2] == 1 }}
+        run: |
+          echo 'AWS_LC_SYS_EXTERNAL_BINDGEN=0' >> "$GITHUB_ENV"
       - name: Cross-compilation (test release)
         run: cross test -p aws-lc-rs --release --features unstable --target ${{ matrix.target[0] }}
       - if: ${{ matrix.target[1] == 1 }}
@@ -259,7 +262,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [13.4, 14.1]
+        target: [ 13.4, 14.1 ]
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/sys-bindings-generator.yml b/.github/workflows/sys-bindings-generator.yml
index 6fc002d614d..e2a4d114704 100644
--- a/.github/workflows/sys-bindings-generator.yml
+++ b/.github/workflows/sys-bindings-generator.yml
@@ -215,7 +215,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ aarch64-unknown-linux-gnu, i686-unknown-linux-gnu, aarch64-unknown-linux-musl, x86_64-unknown-linux-musl ]
+        target:
+          - "aarch64-linux-android"
+          - "aarch64-unknown-linux-gnu"
+          - "i686-unknown-linux-gnu"
+          - "aarch64-unknown-linux-musl"
+          - "x86_64-unknown-linux-musl"
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/aws-lc-sys/Cargo.toml b/aws-lc-sys/Cargo.toml
index 63ee649467b..d555ad61d86 100644
--- a/aws-lc-sys/Cargo.toml
+++ b/aws-lc-sys/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "aws-lc-sys"
 description = "AWS-LC is a general-purpose cryptographic library maintained by the AWS Cryptography team for AWS and their customers. It іs based on code from the Google BoringSSL project and the OpenSSL project."
-version = "0.24.1"
-links = "aws_lc_0_24_1"
+version = "0.24.2"
+links = "aws_lc_0_24_2"
 authors = ["AWS-LC"]
 edition = "2021"
 repository = "https://github.com/aws/aws-lc-rs"
diff --git a/aws-lc-sys/builder/main.rs b/aws-lc-sys/builder/main.rs
index 3619a421d11..3ed608ef7dd 100644
--- a/aws-lc-sys/builder/main.rs
+++ b/aws-lc-sys/builder/main.rs
@@ -430,6 +430,7 @@ fn initialize() {
         let target = target();
         let supported_platform = match target.as_str() {
             "aarch64-apple-darwin"
+            | "aarch64-linux-android"
             | "aarch64-pc-windows-msvc"
             | "aarch64-unknown-linux-gnu"
             | "aarch64-unknown-linux-musl"