SDL: check SONAME of a library generated by AndroidBuild.sh

project/jni/application/CustomBuildScript.mk

@@ -39,6 +39,11 @@ SDL_APP_LIB_DEPENDS_$(1) += $$(APPDIR)/AndroidBuild.sh $$(APPDIR)/AndroidAppSett
 
 $$(APPDIR)/libapplication-$(1).so: $$(SDL_APP_LIB_DEPENDS_$(1))
 	cd $$(APPDIR) && ./AndroidBuild.sh $(1) $$(TARGET_GCC_PREFIX_$(1))
+	@objdump -p $$@ | grep 'SONAME' && { \
+		objdump -p $$@ | grep 'SONAME *libapplication.so' || { \
+			rm $$@ ; echo 'Error: $$@ must have SONAME set to "libapplication.so", add option -Wl,-soname=libapplication.so to your linker flags' ; \
+		} ; \
+	}
 
 #$$(warning ====== $$(APPDIR)/libapplication-$(1).so: ==> $$(SDL_APP_LIB_DEPENDS_$(1)))
 

project/jni/application/openttd/AndroidAppSettings.cfg

@@ -7,10 +7,10 @@ AppName="OpenTTD"
 AppFullName=org.openttd.sdl
 
 # Application version code (integer)
-AppVersionCode=111091
+AppVersionCode=111092
 
 # Application user-visible version name (string)
-AppVersionName="1.11.0.91"
+AppVersionName="1.11.0.92"
 
 # 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, '!!' will also hide the entry from the menu, so it cannot be disabled

project/jni/application/openttd/AndroidBuild.sh

@@ -92,5 +92,5 @@ export ARCH=$1
 NCPU=8
 uname -s | grep -i "linux" > /dev/null && NCPU=`cat /proc/cpuinfo | grep -c -i processor`
 
-make -C openttd-$VER-$1 -j$NCPU VERBOSE=1 STRIP='' && cp -f openttd-$VER-$1/libopenttd.so libapplication-$1.so || exit 1
+make -C openttd-$VER-$1 -j$NCPU VERBOSE=1 STRIP='' && cp -f openttd-$VER-$1/libapplication.so libapplication-$1.so || exit 1