From 3cf8c31360c944fe7f5722f833fc72e6c886ebee Mon Sep 17 00:00:00 2001
From: James Swan <jameswan@amazon.com>
Date: Tue, 19 Sep 2023 22:43:33 +0000
Subject: [PATCH] Resolve android-build tools path

Fixes #2452

In a previous [commit](https://github.com/aws/aws-sdk-cpp/commit/de98602)
a bunch of directories were moved under /tools, including android-build.
At this time, scripts and CMake configurations were not updated, which
has caused build failures.
---
 cmake/build_external.cmake                     | 2 +-
 tools/android-build/CMakeLists.txt             | 4 ++--
 tools/android-build/build_and_test_android.py  | 2 +-
 tools/android-build/configure_openssl_cmake.py | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake
index f8cfb63232d..555d54572b8 100644
--- a/cmake/build_external.cmake
+++ b/cmake/build_external.cmake
@@ -131,7 +131,7 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB)
         -DEXTERNAL_CXX_FLAGS=${EXTERNAL_CXX_FLAGS}
         -DEXTERNAL_C_FLAGS=${EXTERNAL_C_FLAGS}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        ${CMAKE_CURRENT_SOURCE_DIR}/android-build
+        ${CMAKE_CURRENT_SOURCE_DIR}/tools/android-build
         WORKING_DIRECTORY ${EXTERNAL_BUILD_DIR}
         RESULT_VARIABLE CONFIGURE_DEPS_EXIT_CODE)
 
diff --git a/tools/android-build/CMakeLists.txt b/tools/android-build/CMakeLists.txt
index d88f235750f..dedf79cec88 100644
--- a/tools/android-build/CMakeLists.txt
+++ b/tools/android-build/CMakeLists.txt
@@ -39,7 +39,7 @@ if(BUILD_OPENSSL)
         GIT_REPOSITORY https://github.com/openssl/openssl.git
         GIT_TAG e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72 # 1.1.1g
         UPDATE_COMMAND ""
-        PATCH_COMMAND cd ${CMAKE_BINARY_DIR} && python ${AWS_NATIVE_SDK_ROOT}/android-build/configure_openssl_cmake.py --source ${AWS_NATIVE_SDK_ROOT} --dest ${OPENSSL_SOURCE_DIR}
+        PATCH_COMMAND cd ${CMAKE_BINARY_DIR} && python ${AWS_NATIVE_SDK_ROOT}/tools/android-build/configure_openssl_cmake.py --source ${AWS_NATIVE_SDK_ROOT} --dest ${OPENSSL_SOURCE_DIR}
         CMAKE_ARGS
         -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
         -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION}
@@ -66,7 +66,7 @@ if(BUILD_CURL)
         UPDATE_COMMAND ""
         PATCH_COMMAND ""
         CMAKE_ARGS
-        -C ${AWS_NATIVE_SDK_ROOT}/android-build/CurlAndroidCrossCompile.cmake
+        -C ${AWS_NATIVE_SDK_ROOT}/tools/android-build/CurlAndroidCrossCompile.cmake
         -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
         -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION}
         -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL}
diff --git a/tools/android-build/build_and_test_android.py b/tools/android-build/build_and_test_android.py
index 3511e0e38ae..eefb21e2d0c 100644
--- a/tools/android-build/build_and_test_android.py
+++ b/tools/android-build/build_and_test_android.py
@@ -420,7 +420,7 @@ def Main():
         InstallTests(credentialsFile)
 
         print("Installing certs...")
-        BuildAndInstallCertSet("android-build", buildDir)
+        BuildAndInstallCertSet("tools/android-build", buildDir)
 
         print("Uploading test resources")
         UploadTestResources("aws-cpp-sdk-lambda-integration-tests/resources")
diff --git a/tools/android-build/configure_openssl_cmake.py b/tools/android-build/configure_openssl_cmake.py
index 1fbf2d90f94..f7bf26ef900 100644
--- a/tools/android-build/configure_openssl_cmake.py
+++ b/tools/android-build/configure_openssl_cmake.py
@@ -10,7 +10,7 @@
 # openssl doesn't have any cmake files; this script copies in cmake files to appropriate directories
 # The CMakeFiles.txt and *.cmake files are variants of what can be found at https://github.com/janbar/openssl-cmake
 def CopyCMakeFiles(baseDir, destDir):
-    sourceDir = os.path.join(baseDir, "android-build", "cmakefiles", "openssl-cmake")
+    sourceDir = os.path.join(baseDir, "tools", "android-build", "cmakefiles", "openssl-cmake")
     dirLength = len(sourceDir)
 
     for rootDir, dirNames, fileNames in os.walk(sourceDir):