Alexandre Julliard : wineandroid.drv: Pass the source directory on the gradle command line.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 22628bcc1742273affa85cbafb0e494922f424f7
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=22628bcc1742273affa85cbaf...

Author: Alexandre Julliard 
Date:   Fri Sep 11 12:40:43 2020 +0200

wineandroid.drv: Pass the source directory on the gradle command line.

Signed-off-by: Alexandre Julliard

---

Makefile.in                          | 2 +-
 dlls/wineandroid.drv/Makefile.in     | 2 +-
 dlls/wineandroid.drv/build.gradle.in | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 5c6a3e30c5..3f8196ed85 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,7 +75,7 @@ RUNTESTFLAGS    = -q -P wine
 MAKEDEP         = $(TOOLSDIR)/tools/makedep$(TOOLSEXT)
 DELAYLOADFLAG   = @DELAYLOADFLAG@
 PACKAGE_VERSION = @PACKAGE_VERSION@
-SED_CMD         = LC_ALL=C sed -e 's,@bindir@,${bindir},g' -e 's,@dlldir@,${dlldir},g' -e 's,@srcdir@,${srcdir},g' -e 's,@PACKAGE_STRING@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION@,@PACKAGE_VERSION@,g'
+SED_CMD         = LC_ALL=C sed -e 's,@bindir@,${bindir},g' -e 's,@dlldir@,${dlldir},g' -e 's,@PACKAGE_STRING@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION@,@PACKAGE_VERSION@,g'
 api_manext      = 3w
 WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@
 WINELOADER_DEPENDS  = @WINELOADER_DEPENDS@
diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in
index aab69c88de..cb352e38c9 100644
--- a/dlls/wineandroid.drv/Makefile.in
+++ b/dlls/wineandroid.drv/Makefile.in
@@ -18,5 +18,5 @@ SVG_SRCS = \
 EXTRA_TARGETS = wine-debug.apk

wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg
-	gradle -q assembleDebug
+	gradle -q -Psrcdir=$(srcdir) assembleDebug
    mv build/outputs/apk/wine-debug.apk $@
diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in
index 8ae2fb4764..47b9f7a177 100644
--- a/dlls/wineandroid.drv/build.gradle.in
+++ b/dlls/wineandroid.drv/build.gradle.in
@@ -39,7 +39,7 @@ def add_icon_task( dir, scale )
         outputs.dir( outdir )
         doFirst { outdir.mkdirs() }
         def png = new File( outdir, "wine.png" )
-        def svg = new File( "@srcdir@", "wine.svg" )
+        def svg = new File( srcdir, "wine.svg" )
         inputs.file( svg )
         outputs.file( png )
         commandLine "rsvg-convert", "-z", scale, "-o", png, svg
@@ -97,10 +97,10 @@ android
     sourceSets
     {
         main.assets.srcDirs = [ "assets" ]
-        main.java.srcDirs = [ "@srcdir@" ]
+        main.java.srcDirs = [ srcdir ]
         main.jniLibs.srcDirs = [ "lib" ]
         main.java.excludes = [ "build" ]
         main.res.srcDirs = [ "res" ]
-        main.manifest.srcFile "@srcdir@/AndroidManifest.xml"
+        main.manifest.srcFile srcdir + "/AndroidManifest.xml"
     }
 }