diff options
Diffstat (limited to 'standalone/android')
-rwxr-xr-x | standalone/android/buildapk | 4 | ||||
-rw-r--r-- | standalone/android/wrapper.pl | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/standalone/android/buildapk b/standalone/android/buildapk index e91dd28b4..213ddcbb1 100755 --- a/standalone/android/buildapk +++ b/standalone/android/buildapk @@ -14,9 +14,7 @@ fi VER="$(perl -e '$_=<>;print m/\((.*?)\)/'<../../CHANGELOG)" wrap () { - echo "#!/bin/sh -e" > "$2" - echo "echo \"$1 added options: $3\" >&2" >> "$2" - echo "$1 $3 "'"$@"' >> "$2" + sed -e "s!PROG!$1!" -e "s!OPTS!$3! < wrapper.pl > "$2" chmod +x "$2" } diff --git a/standalone/android/wrapper.pl b/standalone/android/wrapper.pl new file mode 100644 index 000000000..ae484a6cf --- /dev/null +++ b/standalone/android/wrapper.pl @@ -0,0 +1,12 @@ +#!/usr/bin/perl +my $prog=q{PROG}; # replaced +my @opts=qw{OPTS}; # replaced + +if (grep { $_ eq "-r" || $_ eq "--relocatable" } @ARGV) { + print "running $prog withthout extra opts, as relocatable build detected\n"; + exec($prog,@ARGV) || die "failed to run $prog"; +} +else { + print "running $prog with extra opts @opts\n"; + exec($prog,@opts,@ARGV) || die "failed to run $prog"; +} |