Commit 22628bcc authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent 4935576d
...@@ -75,7 +75,7 @@ RUNTESTFLAGS = -q -P wine ...@@ -75,7 +75,7 @@ RUNTESTFLAGS = -q -P wine
MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT)
DELAYLOADFLAG = @DELAYLOADFLAG@ DELAYLOADFLAG = @DELAYLOADFLAG@
PACKAGE_VERSION = @PACKAGE_VERSION@ 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 api_manext = 3w
WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@ WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@
WINELOADER_DEPENDS = @WINELOADER_DEPENDS@ WINELOADER_DEPENDS = @WINELOADER_DEPENDS@
......
...@@ -18,5 +18,5 @@ SVG_SRCS = \ ...@@ -18,5 +18,5 @@ SVG_SRCS = \
EXTRA_TARGETS = wine-debug.apk EXTRA_TARGETS = wine-debug.apk
wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg 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 $@ mv build/outputs/apk/wine-debug.apk $@
...@@ -39,7 +39,7 @@ def add_icon_task( dir, scale ) ...@@ -39,7 +39,7 @@ def add_icon_task( dir, scale )
outputs.dir( outdir ) outputs.dir( outdir )
doFirst { outdir.mkdirs() } doFirst { outdir.mkdirs() }
def png = new File( outdir, "wine.png" ) def png = new File( outdir, "wine.png" )
def svg = new File( "@srcdir@", "wine.svg" ) def svg = new File( srcdir, "wine.svg" )
inputs.file( svg ) inputs.file( svg )
outputs.file( png ) outputs.file( png )
commandLine "rsvg-convert", "-z", scale, "-o", png, svg commandLine "rsvg-convert", "-z", scale, "-o", png, svg
...@@ -97,10 +97,10 @@ android ...@@ -97,10 +97,10 @@ android
sourceSets sourceSets
{ {
main.assets.srcDirs = [ "assets" ] main.assets.srcDirs = [ "assets" ]
main.java.srcDirs = [ "@srcdir@" ] main.java.srcDirs = [ srcdir ]
main.jniLibs.srcDirs = [ "lib" ] main.jniLibs.srcDirs = [ "lib" ]
main.java.excludes = [ "build" ] main.java.excludes = [ "build" ]
main.res.srcDirs = [ "res" ] main.res.srcDirs = [ "res" ]
main.manifest.srcFile "@srcdir@/AndroidManifest.xml" main.manifest.srcFile srcdir + "/AndroidManifest.xml"
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment