diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2022-04-18 11:57:01 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-18 11:57:01 +1000 |
| commit | 8e0f6f958ce4c4e2d68c12fa9234ed081262c8c3 (patch) | |
| tree | 9b2d0e86fbd777070566688526d37557375ce296 /tools | |
| parent | d89c10711a535e572db1f093dbed9da0eed9fb6a (diff) | |
| parent | 84b77c79561f0d219821787c38f1d2e9bf7f6d3c (diff) | |
Merge pull request #21271 from fuzzard/android_buildtoolscleanup
[Android] build tools cleanup
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/Makefile.include.in | 4 | ||||
| -rw-r--r-- | tools/depends/configure.ac | 24 |
2 files changed, 4 insertions, 24 deletions
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..deeacae887 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac @@ -569,34 +569,18 @@ 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 +# darwin needs unzip in Codesign.command if test "$platform_os" = "android" || test "$platform_os" = "osx" || test "$platform_os" = "darwin_embedded"; then AC_CHECK_PROG(HAVE_UNZIP,unzip,"yes","no",) if test "x$HAVE_UNZIP" = "xno"; then AC_MSG_ERROR("Missing program: unzip") fi fi -if test "$platform_os" = "osx" || test "$platform_os" = "darwin_embedded"; then +# darwin needs zip in Codesign.command +# android needs zip in tools/android/packaging/Makefile sharedobb target +if test "$platform_os" = "android" || test "$platform_os" = "osx" || test "$platform_os" = "darwin_embedded"; then AC_CHECK_PROG(HAVE_ZIP,zip,"yes","no",) if test "x$HAVE_ZIP" = "xno"; then AC_MSG_ERROR("Missing program: zip") |