diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-04-16 22:28:50 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-04-16 22:28:50 +1000 |
| commit | c1dca062e6a30c38bd5e5989ef6ad1a197d945dd (patch) | |
| tree | ab498f526e14da88ed150024cf6712a2afc4fc9f | |
| parent | adcff918bc783d3b0f57aa8a4c41d79d76f8f5ea (diff) | |
[android] remove checks for unused tools aapt/dx/d8/zipalign
Usage of the 3 explicit tools is no longer used, and gradle is used for
all build steps that were once done explicitly by these tools. No need to keep checks,
leave that to gradle internally.
| -rw-r--r-- | cmake/scripts/android/Install.cmake | 15 | ||||
| -rw-r--r-- | tools/depends/Makefile.include.in | 4 | ||||
| -rw-r--r-- | tools/depends/configure.ac | 18 |
3 files changed, 0 insertions, 37 deletions
diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake index f799afa556..e67da3530a 100644 --- a/cmake/scripts/android/Install.cmake +++ b/cmake/scripts/android/Install.cmake @@ -1,17 +1,5 @@ # Android packaging -find_program(AAPT_EXECUTABLE aapt PATHS ${SDK_BUILDTOOLS_PATH}) -if(NOT AAPT_EXECUTABLE) - message(FATAL_ERROR "Could NOT find aapt executable") -endif() -find_program(D8_EXECUTABLE d8 PATHS ${SDK_BUILDTOOLS_PATH}) -if(NOT D8_EXECUTABLE) - find_program(DX_EXECUTABLE dx PATHS ${SDK_BUILDTOOLS_PATH}) - if(NOT DX_EXECUTABLE) - message(FATAL_ERROR "Could NOT find dx or d8 executable") - endif() -endif() - if(CMAKE_BUILD_TYPE STREQUAL Debug) set(ANDROID_DEBUGGABLE true) else() @@ -174,9 +162,6 @@ foreach(target apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb apk-clean NDKROOT=${NDKROOT} SDKROOT=${SDKROOT} STRIP=${CMAKE_STRIP} - AAPT=${AAPT_EXECUTABLE} - DX=${DX_EXECUTABLE} - D8=${D8_EXECUTABLE} ${target} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tools/android/packaging ) diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in index db73f05afb..6b45eca0f3 100644 --- a/tools/depends/Makefile.include.in +++ b/tools/depends/Makefile.include.in @@ -27,10 +27,6 @@ NATIVE_ARCH_DEFINES=@NATIVE_ARCH_DEFINES@ TARGET_PLATFORM=@target_platform@ RENDER_SYSTEM=@app_rendersystem@ WINDOW_SYSTEM=@app_winsystem@ -AAPT=@AAPT@ -DX=@DX@ -D8=@D8@ -ZIPALIGN=@ZIPALIGN@ SHA512SUM=@SHA512SUM@ SHA256SUM=@SHA256SUM@ SHASUM=@SHASUM@ diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac index d4e9172922..fb5cbb6c93 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac @@ -569,24 +569,6 @@ if test "$platform_os" == "android"; then SORT_PARAMS="" sort -V /dev/null > /dev/null 2>&1 && SORT_PARAMS="-V" build_tools_path=$use_sdk_path/tools:$use_sdk_path/platform-tools:$use_sdk_path/build-tools/`ls $use_sdk_path/build-tools | sort $SORT_PARAMS | tail -n 1` - - AC_PATH_PROG(AAPT,aapt,"no",$build_tools_path) - if test "x$AAPT" = "xno" ; then - AC_MSG_ERROR("Missing program: aapt") - fi - - AC_PATH_PROG(D8,d8,"no",$build_tools_path) - if test "x$D8" = "xno" ; then - AC_PATH_PROG(DX,dx,"no",$build_tools_path) - if test "x$DX" = "xno" ; then - AC_MSG_ERROR("Missing program: dx or d8") - fi - fi - - AC_PATH_PROG(ZIPALIGN,zipalign,"no",$build_tools_path) - if test "x$ZIPALIGN" = "xno" ; then - AC_MSG_ERROR("Missing program: zipalign") - fi fi # darwin needs unzip/zip in Codesign.command |