Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve android-build tools path #2685

Merged
merged 1 commit into from
Sep 26, 2023
Merged

Resolve android-build tools path #2685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/build_external.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions tools/android-build/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion tools/android-build/build_and_test_android.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion tools/android-build/configure_openssl_cmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Loading