wscript: force Android to follow library naming

Author: a1batross

cl_dll/wscript

@@ -114,7 +114,7 @@ def build(bld):
 	if 'HAVE_STRLCAT=1' not in defines:
 		source += bld.path.parent.ant_glob('external/openbsd/strlcat.c')
 
-	if bld.env.DEST_OS not in ['android', 'dos'] or bld.env.TERMUX:
+	if bld.env.DEST_OS != 'dos' and not bld.env.ANDROID_APK:
 		install_path = os.path.join(bld.env.GAMEDIR, bld.env.CLIENT_INSTALL_DIR)
 	else:
 		install_path = bld.env.PREFIX

dlls/wscript

@@ -46,7 +46,7 @@ def build(bld):
 		'../public'
 	]
 
-	if bld.env.DEST_OS not in ['android', 'dos'] or bld.env.TERMUX:
+	if bld.env.DEST_OS != 'dos' and not bld.env.ANDROID_APK:
 		install_path = os.path.join(bld.env.GAMEDIR, bld.env.SERVER_INSTALL_DIR)
 	else:
 		install_path = bld.env.PREFIX

scripts/waifulib/library_naming.py

@@ -183,10 +183,7 @@ def configure(conf):
 		if conf.env.XASH_X86:
 			buildarch = ''
 
-	if conf.env.XASH_ANDROID and not conf.env.XASH_TERMUX:
-		# force disable for Android, as Android ports aren't distributed in normal way and doesn't follow library naming
-		postfix = ''
-	elif buildos != '' and buildarch != '':
+	if buildos != '' and buildarch != '':
 		postfix = '_%s_%s' % (buildos,buildarch)
 	elif buildarch != '':
 		postfix = '_%s' % buildarch

wscript

@@ -58,6 +58,8 @@ def options(opt):
 		help = 'disable compilation abort on warning')
 	grp.add_option('--enable-voicemgr', action = 'store_true', dest = 'USE_VOICEMGR', default = False,
 		help = 'Enable VOICE MANAGER')
+	grp.add_option('--enable-android-apk', action = 'store_true', dest = 'ANDROID_APK', default = False,
+		help = 'Enable Android APK styled libraries deploy')
 
 	# a1ba: hidden option for CI
 	grp.add_option('--enable-msvcdeps', action='store_true', dest='MSVCDEPS', default=False, help='')
@@ -274,13 +276,9 @@ def configure(conf):
 	if conf.env.HLDEMO_BUILD and conf.env.OEM_BUILD:
 		conf.fatal('Don\'t mix Demo and OEM builds!')
 
-	# force to use server library name
-	if conf.env.DEST_OS == 'android' and not conf.env.TERMUX:
-		conf.env.SERVER_LIBRARY_NAME = 'server' # can't be any other name, until specified
-	else:
-		# strip lib from pattern
-		if conf.env.cxxshlib_PATTERN.startswith('lib'):
-			conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:]
+	# strip lib from pattern
+	if conf.env.cxxshlib_PATTERN.startswith('lib'):
+		conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:]
 
 	conf.load('library_naming')
 	conf.add_subproject('game_shared dlls cl_dll')