miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: Extract binaries-<ARCH>-pie.zip for Lollipop and newer, then try binaries-<ARCH>.zip

Browse Source
This commit is contained in:
Sergii Pylypenko
2015-01-13 22:10:27 +02:00
parent cad2353c79
commit 3a5d384ad2
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/java/MainActivity.java
View File

@@ -1096,8 +1096,9 @@ public class MainActivity extends Activity
} }
} }
// ----- VCMI hack -----
String [] binaryZipNames = { "binaries-" + android.os.Build.CPU_ABI + ".zip", "binaries-" + android.os.Build.CPU_ABI2 + ".zip", "binaries.zip" }; String [] binaryZipNames = { "binaries-" + android.os.Build.CPU_ABI + ".zip", "binaries-" + android.os.Build.CPU_ABI2 + ".zip", "binaries.zip" };
if ( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP )
binaryZipNames = new String[] { "binaries-" + android.os.Build.CPU_ABI + "-pie.zip", "binaries-" + android.os.Build.CPU_ABI2 + "-pie.zip", "binaries-" + android.os.Build.CPU_ABI + ".zip", "binaries-" + android.os.Build.CPU_ABI2 + ".zip", "binaries.zip" };
for(String binaryZip: binaryZipNames) for(String binaryZip: binaryZipNames)
{ {
try { try {
@@ -1203,7 +1204,6 @@ public class MainActivity extends Activity
//Log.i("SDL", "libSDL: Error: " + eee.toString()); //Log.i("SDL", "libSDL: Error: " + eee.toString());
} }
} }
// ----- VCMI hack -----
}; };
public static void LoadApplicationLibrary(final Context context) public static void LoadApplicationLibrary(final Context context)

4
project/jni/application/xserver/AndroidAppSettings.cfg
View File

@@ -7,10 +7,10 @@ AppName="XServer XSDL"
AppFullName=x.org.server AppFullName=x.org.server
# Application version code (integer) # Application version code (integer)
AppVersionCode=11121 AppVersionCode=11122
# Application user-visible version name (string) # Application user-visible version name (string)
AppVersionName="1.11.21" AppVersionName="1.11.22"
# Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
# If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu

10
project/jni/application/xserver/AndroidBuild.sh
View File

@@ -72,12 +72,16 @@ cp $CURDIR/xserver/data/busybox-$1 ./busybox
cp $CURDIR/ssh ./ cp $CURDIR/ssh ./
cp $CURDIR/sshpass ./ cp $CURDIR/sshpass ./
mkdir -p usr/bin mkdir -p usr/bin
# Executables linked with NDK, which crash on some devices. # Executables linked with NDK, which crash on Lollipop.
for f in xhost xkbcomp xli xsel; do cp $CURDIR/xserver/android/$1/$f ./usr/bin/ ; done for f in xhost xkbcomp xli xsel; do cp $CURDIR/xserver/android/$1/$f ./usr/bin/$f ; done
# Statically-linked prebuilt executables, generated using Debian chroot. # Statically-linked prebuilt executables, generated using Debian chroot.
# There are no executables for old ARMv5, so we'll use NDK executables instead for that arch. # There are no executables for old ARMv5, so we'll use NDK executables instead for that arch.
for f in xhost xkbcomp xli xsel; do cp $CURDIR/xserver/data/$f-$1 ./usr/bin/$f ; done #for f in xhost xkbcomp xli xsel; do cp $CURDIR/xserver/data/$f-$1 ./usr/bin/$f ; done
rm -f ../AndroidData/binaries-$1.zip rm -f ../AndroidData/binaries-$1.zip
zip -r ../AndroidData/binaries-$1.zip . zip -r ../AndroidData/binaries-$1.zip .
# Executables linked with NDK with -pie, which crash on pre-Lollipop.
for f in xhost xkbcomp xli xsel; do rm ./usr/bin/$f ; cp $CURDIR/xserver/android/$1/pie/$f ./usr/bin/$f ; done
rm -f ../AndroidData/binaries-$1-pie.zip
zip -r ../AndroidData/binaries-$1-pie.zip .
exit 0 exit 0

2
project/jni/application/xserver/xserver

Submodule project/jni/application/xserver/xserver updated: f8e8197ac7...d0bceab146