From: Twaik Yont <9674930+twaik@users.noreply.github.com> Print a message when the dummy wine-debug.apk target is built without packaged assets, pointing to a reference full build script. This clarifies that the target is only a sanity check and helps avoid confusion when the resulting APK is not a complete build. Also document this behavior in Makefile.in. Signed-off-by: Twaik Yont <9674930+twaik@users.noreply.github.com> --- configure | 3 ++- configure.ac | 3 ++- dlls/wineandroid.drv/Makefile.in | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0c98a451379..016f03d6b28 100755 --- a/configure +++ b/configure @@ -24830,7 +24830,8 @@ programs/winetest/build.rc: dummy @build=\"STRINGTABLE { 1 \\\"\`GIT_DIR=${wine_srcdir}.git git rev-parse HEAD 2>/dev/null\`\\\" }\" && (echo \$\$build | cmp -s - \$@) || echo \$\$build >\$@ || (rm -f \$@ && exit 1) dlls/wineandroid.drv/wine-debug.apk: dlls/wineandroid.drv/build.gradle ${wine_srcdir}dlls/wineandroid.drv/AndroidManifest.xml ${wine_srcdir}dlls/wineandroid.drv/WineActivity.java ${wine_srcdir}dlls/wineandroid.drv/wine.svg cd dlls/wineandroid.drv && env ANDROID_HOME=\"$ANDROID_HOME\" $GRADLE -q -Psrcdir=$srcdir assembleDebug - mv dlls/wineandroid.drv/build/outputs/apk/debug/wine-debug.apk \$@" + mv dlls/wineandroid.drv/build/outputs/apk/debug/wine-debug.apk \$@ + @(cd dlls/wineandroid.drv && test -d assets && test -d lib) || echo \"Dummy APK build succeeded. For a full build example, see: https://gitlab.winehq.org/winehq/tools/-/tree/master/packaging/android\" >&2" EXTERNAL_SUBDIRS="libs/capstone libs/c++ libs/c++abi libs/faudio libs/fluidsynth libs/gsm libs/icucommon libs/icui18n libs/jpeg libs/jxr libs/lcms2 libs/ldap libs/mpg123 libs/musl libs/png libs/tiff libs/tomcrypt libs/unwind libs/vkd3d libs/xml2 libs/xslt libs/zlib libs/compiler-rt" diff --git a/configure.ac b/configure.ac index 1a0bca19403..22326582bd0 100644 --- a/configure.ac +++ b/configure.ac @@ -3925,7 +3925,8 @@ programs/winetest/build.rc: dummy @build=\"STRINGTABLE { 1 \\\"\`GIT_DIR=${wine_srcdir}.git git rev-parse HEAD 2>/dev/null\`\\\" }\" && (echo \$\$build | cmp -s - \$[@]) || echo \$\$build >\$[@] || (rm -f \$[@] && exit 1) dlls/wineandroid.drv/wine-debug.apk: dlls/wineandroid.drv/build.gradle ${wine_srcdir}dlls/wineandroid.drv/AndroidManifest.xml ${wine_srcdir}dlls/wineandroid.drv/WineActivity.java ${wine_srcdir}dlls/wineandroid.drv/wine.svg cd dlls/wineandroid.drv && env ANDROID_HOME=\"$ANDROID_HOME\" $GRADLE -q -Psrcdir=$srcdir assembleDebug - mv dlls/wineandroid.drv/build/outputs/apk/debug/wine-debug.apk \$[@]]) + mv dlls/wineandroid.drv/build/outputs/apk/debug/wine-debug.apk \$[@] + @(cd dlls/wineandroid.drv && test -d assets && test -d lib) || echo \"Dummy APK build succeeded. For a full build example, see: https://gitlab.winehq.org/winehq/tools/-/tree/master/packaging/android\" >&2]) dnl Misc rules diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 9a8be0ef90a..2f20575eac7 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -13,4 +13,6 @@ SOURCES = \ window.c \ wine.svg +# wine-debug.apk is a dummy target used to verify the build. +# For a full build script example, see: https://gitlab.winehq.org/winehq/tools/-/tree/master/packaging/android EXTRA_TARGETS = wine-debug.apk -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10438