Merge pull request #2848 from billdawson/timob-7474

TIMOB-7474 tiapp.xml setting to target only specific android architectur...

support/android/builder.py

@@ -70,6 +70,7 @@
 
 
 MIN_API_LEVEL = 8
+KNOWN_ABIS = ("armeabi", "armeabi-v7a", "x86")
 
 def render_template_with_tiapp(template_text, tiapp_obj):
 	t = Template(template_text)
@@ -218,6 +219,8 @@ def __init__(self, name, sdk, project_dir, support_dir, app_id):
 		self.fastdev_port = -1
 		self.fastdev = False
 		self.compile_js = False
+		self.tool_api_level = MIN_API_LEVEL
+		self.abis = list(KNOWN_ABIS)
 
 		# don't build if a java keyword in the app id would cause the build to fail
 		tok = self.app_id.split('.')
@@ -227,10 +230,23 @@ def __init__(self, name, sdk, project_dir, support_dir, app_id):
 				sys.exit(1)
 
 		temp_tiapp = TiAppXML(self.project_tiappxml)
-		if temp_tiapp and temp_tiapp.android and 'tool-api-level' in temp_tiapp.android:
-			self.tool_api_level = int(temp_tiapp.android['tool-api-level'])
-		else:
-			self.tool_api_level = MIN_API_LEVEL
+		if temp_tiapp and temp_tiapp.android:
+			if 'tool-api-level' in temp_tiapp.android:
+				self.tool_api_level = int(temp_tiapp.android['tool-api-level'])
+
+			if 'abi' in temp_tiapp.android and temp_tiapp.android['abi'] != 'all':
+				tiapp_abis = [abi.strip() for abi in temp_tiapp.android['abi'].split(",")]
+				to_remove = [bad_abi for bad_abi in tiapp_abis if bad_abi not in KNOWN_ABIS]
+				if to_remove:
+					warn("The following ABIs listed in the Android <abi> section of tiapp.xml are unknown and will be ignored: %s." % ", ".join(to_remove))
+					tiapp_abis = [abi for abi in tiapp_abis if abi not in to_remove]
+
+				self.abis = tiapp_abis
+				if not self.abis:
+					warn("Android <abi> tiapp.xml section does not specify any valid ABIs. Defaulting to '%s'." %
+							",".join(KNOWN_ABIS))
+					self.abis = list(KNOWN_ABIS)
+
 		self.sdk = AndroidSDK(sdk, self.tool_api_level)
 		self.tiappxml = temp_tiapp
 
@@ -1447,6 +1463,8 @@ def add_resource_jar(jar_file):
 		def add_native_libs(libs_dir, exclude=[]):
 			if os.path.exists(libs_dir):
 				for abi_dir in os.listdir(libs_dir):
+					if abi_dir not in self.abis:
+						continue
 					libs_abi_dir = os.path.join(libs_dir, abi_dir)
 					if not os.path.isdir(libs_abi_dir): continue
 					for file in os.listdir(libs_abi_dir):
@@ -1474,25 +1492,21 @@ def add_native_libs(libs_dir, exclude=[]):
 		# add sdk runtime native libraries
 		debug("installing native SDK libs")
 		sdk_native_libs = os.path.join(template_dir, 'native', 'libs')
-		apk_zip.write(os.path.join(sdk_native_libs, 'armeabi', 'libtiverify.so'), 'lib/armeabi/libtiverify.so')
-		apk_zip.write(os.path.join(sdk_native_libs, 'armeabi-v7a', 'libtiverify.so'), 'lib/armeabi-v7a/libtiverify.so')
-		# See below about x86 and production
-		x86_dir = os.path.join(sdk_native_libs, 'x86')
-		if self.deploy_type != 'production' and os.path.exists(x86_dir):
-			apk_zip.write(os.path.join(x86_dir, 'libtiverify.so'), 'lib/x86/libtiverify.so')
-
-		if self.runtime == 'v8':
-			apk_zip.write(os.path.join(sdk_native_libs, 'armeabi', 'libkroll-v8.so'), 'lib/armeabi/libkroll-v8.so')
-			apk_zip.write(os.path.join(sdk_native_libs, 'armeabi', 'libstlport_shared.so'), 'lib/armeabi/libstlport_shared.so')
-			apk_zip.write(os.path.join(sdk_native_libs, 'armeabi-v7a', 'libkroll-v8.so'), 'lib/armeabi-v7a/libkroll-v8.so')
-			apk_zip.write(os.path.join(sdk_native_libs, 'armeabi-v7a', 'libstlport_shared.so'), 'lib/armeabi-v7a/libstlport_shared.so')
-			# Only include x86 in non-production builds for now, since there are
-			# no x86 devices on the market
-			if self.deploy_type != 'production' and os.path.exists(x86_dir):
-				apk_zip.write(os.path.join(x86_dir, 'libkroll-v8.so'), 'lib/x86/libkroll-v8.so')
-				apk_zip.write(os.path.join(x86_dir, 'libstlport_shared.so'), 'lib/x86/libstlport_shared.so')
 
-
+		for abi in self.abis:
+			lib_source_dir = os.path.join(sdk_native_libs, abi)
+			lib_dest_dir = 'lib/%s/' % abi
+			if abi == 'x86' and ((not os.path.exists(lib_source_dir)) or self.deploy_type == 'production'):
+				# x86 only in non-production builds for now.
+				continue
+
+			# libtiverify is always included, even if targeting rhino.
+			apk_zip.write(os.path.join(lib_source_dir, 'libtiverify.so'), lib_dest_dir + 'libtiverify.so')
+
+			if self.runtime == 'v8':
+				for fname in ('libkroll-v8.so', 'libstlport_shared.so'):
+					apk_zip.write(os.path.join(lib_source_dir, fname), lib_dest_dir + fname)
+
 		self.apk_updated = True
 
 		apk_zip.close()
@@ -1635,6 +1649,14 @@ def run_app(self):
 		trace("Launch output: %s" % output)
 
 	def wait_for_sdcard(self):
+		mount_points_check = ['/sdcard', '/mnt/sdcard']
+		# Check the symlink that is typically in root.
+		# If you find it, add its target to the mount points to check.
+		output = self.run_adb('shell', 'ls', '-l', '/sdcard')
+		if output:
+			target_pattern = r"\-\> (\S+)\s*$"
+			mount_points_check.extend(re.findall(target_pattern, output))
+
 		info("Waiting for SDCard to become available..")
 		waited = 0
 		max_wait = 60
@@ -1646,7 +1668,7 @@ def wait_for_sdcard(self):
 					tokens = mount_point.split()
 					if len(tokens) < 2: continue
 					mount_path = tokens[1]
-					if mount_path in ['/sdcard', '/mnt/sdcard']:
+					if mount_path in mount_points_check:
 						return True
 			else:
 				error("Error checking for SDCard using 'mount'")

support/tiapp.py

@@ -238,9 +238,12 @@ def parse_services(node):
 		def parse_tool_api_level(node):
 			lazy_init('tool-api-level', get_text(node))
 
+		def parse_abi(node):
+			lazy_init('abi', get_text(node))
+
 
 		local_objects = locals()
-		parse_tags = ['services', 'activities', 'manifest', 'tool-api-level']
+		parse_tags = ['services', 'activities', 'manifest', 'tool-api-level', 'abi']
 		for child in node.childNodes:
 			if child.nodeName in parse_tags:
 				local_objects['parse_'+child.nodeName.replace('-', '_')](child)