Added aws-lc as a submodule, added it to cmake build (#286)

Author: Justin Boswell

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
       - '!main'
 
 env:
-  BUILDER_VERSION: v0.7.6
+  BUILDER_VERSION: v0.8.11
   BUILDER_SOURCE: releases
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
   PACKAGE_NAME: aws-crt-java
@@ -34,7 +34,8 @@ jobs:
         export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.image }}:${{ env.BUILDER_VERSION }}
         docker pull $DOCKER_IMAGE
         docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} \
-          --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream
+          --env GITHUB_REF $DOCKER_IMAGE \
+          build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
@@ -57,7 +58,8 @@ jobs:
         export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-al2-x64:${{ env.BUILDER_VERSION }}
         docker pull $DOCKER_IMAGE
         docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} \
-          --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream
+          --env GITHUB_REF $DOCKER_IMAGE \
+          build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
@@ -70,7 +72,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [3, 6, 8, 9]
+        version: [3, 6, 8, 9, 10, 11]
     steps:
         # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
     - name: Checkout Sources
@@ -83,7 +85,8 @@ jobs:
         export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
         docker pull $DOCKER_IMAGE
         docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} \
-          --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream --compiler=clang-${{ matrix.version }}
+          --env GITHUB_REF $DOCKER_IMAGE \
+          build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream --compiler=clang-${{ matrix.version }}
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
@@ -109,7 +112,8 @@ jobs:
         export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }}
         docker pull $DOCKER_IMAGE
         docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} \
-          --env GITHUB_REF $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream --compiler=gcc-${{ matrix.version }}
+          --env GITHUB_REF $DOCKER_IMAGE \
+          build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream --compiler=gcc-${{ matrix.version }}
     - uses: actions/upload-artifact@v2
       if: failure()
       with:

.gitmodules

@@ -32,3 +32,6 @@
 	path = crt/aws-c-s3
 	url = https://github.com/awslabs/aws-c-s3.git
 
+[submodule "aws-lc"]
+	path = crt/aws-lc
+	url = https://github.com/awslabs/aws-lc.git

CMakeLists.txt

@@ -46,14 +46,6 @@ set(AWS_LIBRARY_OUTPUT_DIR "${CMAKE_BINARY_DIR}/lib")
 
 if (ANDROID)
     set(ANDROID_DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/target/cmake-build/deps/${ANDROID_ABI})
-    set(LibCrypto_INCLUDE_DIR "${ANDROID_DEPS_DIR}/libcrypto/include" CACHE INTERNAL "")
-    set(LibCrypto_STATIC_LIBRARY "${ANDROID_DEPS_DIR}/libcrypto/lib/libcrypto.a" CACHE INTERNAL "")
-    set(LibCrypto_SHARED_LIBRARY "${ANDROID_DEPS_DIR}/libcrypto/lib/libcrypto.so" CACHE INTERNAL "")
-
-    if (NOT EXISTS ${LibCrypto_INCLUDE_DIR}/openssl/crypto.h OR
-        NOT EXISTS ${LibCrypto_STATIC_LIBRARY})
-        message(FATAL_ERROR "Could not find libcrypto at ${CMAKE_BINARY_DIR}/deps/libcrypto")
-    endif()
     set(AWS_LIBRARY_OUTPUT_DIR "${CMAKE_BINARY_DIR}/../../../lib")
 endif()
 
@@ -65,6 +57,7 @@ if (BUILD_DEPS)
     set(BUILD_TESTING OFF)
     add_subdirectory(crt/aws-c-common)
     if (UNIX AND NOT APPLE)
+        include(crt/aws-c-cal/cmake/modules/aws-lc.cmake)
         add_subdirectory(crt/s2n)
     endif()
     add_subdirectory(crt/aws-c-io)
@@ -144,7 +137,6 @@ aws_use_package(aws-c-mqtt)
 aws_use_package(aws-c-auth)
 aws_use_package(aws-c-event-stream)
 aws_use_package(aws-c-s3)
-aws_use_package(aws-c-s3)
 
 target_link_libraries(${PROJECT_NAME} ${DEP_AWS_LIBS})
 if (NOT MSVC AND NOT APPLE)

builder.json

@@ -33,15 +33,12 @@
     },
     "targets": {
         "linux": {
-            "imports": [
-                "s2n"
-            ],
             "!build_steps": [
-                "{source_dir}/gradlew :s3-native-client:build -x test -PlibcryptoPath={source_dir}/{libcrypto_path}",
-                "mvn -B compile -Dlibcrypto.path={libcrypto_path}"
+                "{source_dir}/gradlew :s3-native-client:build -x test",
+                "mvn -B compile"
             ],
             "!test_steps": [
-                "mvn -B test -DforkCount=0 -Dlibcrypto.path={libcrypto_path} -DrerunFailingTestsCount=5"
+                "mvn -B test -DforkCount=0 -DrerunFailingTestsCount=5"
             ],
             "architectures": {
                 "armv6": {
@@ -84,17 +81,13 @@
         },
         "android": {
             "imports": [
-                "s2n",
                 "android-sdk"
             ],
             "build_env": {
                 "ANDROID_SDK_ROOT": "{android_sdk_path}"
             },
             "!build_steps": [
-                "mvn -B compile -Dlibcrypto.path={libcrypto_path}"
-            ],
-            "!test_steps": [
-                "mvn -B test -Dlibcrypto.path={libcrypto_path} -DrerunFailingTestsCount=5"
+                "{source_dir}/gradlew assemble"
             ],
             "architectures": {
                 "armv7": {
@@ -124,20 +117,17 @@
             }
         },
         "freebsd": {
-            "imports": [
-                "s2n"
-            ],
             "packages": [
                 "openjdk8"
             ],
             "!build_env": {
                 "JAVA_HOME": "/usr/local/openjdk8"
             },
             "!build_steps": [
-                "mvn -B compile -Dlibcrypto.path={libcrypto_path}"
+                "mvn -B compile"
             ],
             "!test_steps": [
-                "mvn -B test -Dlibcrypto.path={libcrypto_path} -DrerunFailingTestsCount=5"
+                "mvn -B test -DrerunFailingTestsCount=5"
             ]
         }
     }

crt/aws-c-cal

@@ -36,10 +36,6 @@
         <cmake.buildtype>RelWithDebInfo</cmake.buildtype>
         <cmake.buildconfig>${cmake.buildtype}</cmake.buildconfig>
         <cmake.binaries>target/cmake-build</cmake.binaries>
-        <cmake.libcrypto_include>-DLIBCRYPTO_NOT_USED=1</cmake.libcrypto_include>
-        <cmake.libcrypto_shared>-DLIBCRYPTO_NOT_USED=1</cmake.libcrypto_shared>
-        <cmake.libcrypto_static>-DLIBCRYPTO_NOT_USED=1</cmake.libcrypto_static>
-        <libcrypto.path></libcrypto.path>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -113,19 +109,6 @@
                 <cmake.buildtype>Debug</cmake.buildtype>
             </properties>
         </profile>
-        <profile>
-            <id>use-custom-libcrypto</id>
-            <activation>
-                <property>
-                    <name>libcrypto.path</name>
-                </property>
-            </activation>
-            <properties>
-                <cmake.libcrypto_include>-DLibCrypto_INCLUDE_DIR=${libcrypto.path}/include</cmake.libcrypto_include>
-                <cmake.libcrypto_shared>-DLibCrypto_SHARED_LIBRARY=${libcrypto.path}/lib/libcrypto.so</cmake.libcrypto_shared>
-                <cmake.libcrypto_static>-DLibCrypto_STATIC_LIBRARY=${libcrypto.path}/lib/libcrypto.a</cmake.libcrypto_static>
-            </properties>
-        </profile>
         <!-- native compilation -->
         <profile>
             <id>build-shared-lib</id>
@@ -162,9 +145,6 @@
                                         <argument>-DCMAKE_INSTALL_PREFIX=${cmake.binaries}/install</argument>
                                         <argument>-DCMAKE_C_FLAGS=${cmake.cflags}</argument>
                                         <argument>-DBUILD_TESTING=OFF</argument>
-                                        <argument>${cmake.libcrypto_include}</argument>
-                                        <argument>${cmake.libcrypto_shared}</argument>
-                                        <argument>${cmake.libcrypto_static}</argument>
                                         <argument>-Wno-unused-variables</argument>
                                         <argument>${cmake.generator}</argument>
                                         <argument>${cmake.toolset}</argument>

crt/aws-c-event-stream

@@ -7,8 +7,6 @@ description = "JNI bindings for the AWS Common Runtime"
 
 buildDir = File("../../build")
 
-var libcryptoPath : String? = null
-
 var buildType = "RelWithDebInfo"
 if (project.hasProperty("buildType")) {
     buildType = project.property("buildType").toString()
@@ -26,22 +24,6 @@ val cmakeConfigure = tasks.register("cmakeConfigure") {
         "-DBUILD_TESTING=OFF"
     )
 
-    if (org.gradle.internal.os.OperatingSystem.current().isLinux()) {
-        libcryptoPath = null;
-        // To set this, add -PlibcryptoPath=/path/to/openssl/home on the command line
-        if (project.hasProperty("libcryptoPath")) {
-            libcryptoPath = project.property("libcryptoPath").toString()
-            logger.info("Using project libcrypto path: ${libcryptoPath}")
-        }
-    }
-
-    if (libcryptoPath != null) {
-        cmakeArgs += listOf(
-            "-DLibCrypto_INCLUDE_DIR=${libcryptoPath}/include",
-            "-DLibCrypto_STATIC_LIBRARY=${libcryptoPath}/lib/libcrypto.a"
-        )
-    }
-
     inputs.file("../../CMakeLists.txt")
     outputs.file("${buildDir}/cmake-build/CMakeCache.txt")