Merge "releasetools: Fix an issue in GetMinSdkVersion." am: f18ba63095
am: f3d0d80d81
Change-Id: I09848ccf4daedd77ee62ca48e4bfb7a4c590dba3
This commit is contained in:
commit
cb41f6dea5
|
@ -720,18 +720,31 @@ def GetKeyPasswords(keylist):
|
|||
|
||||
|
||||
def GetMinSdkVersion(apk_name):
|
||||
"""Get the minSdkVersion delared in the APK. This can be both a decimal number
|
||||
(API Level) or a codename.
|
||||
"""Gets the minSdkVersion declared in the APK.
|
||||
|
||||
It calls 'aapt' to query the embedded minSdkVersion from the given APK file.
|
||||
This can be both a decimal number (API Level) or a codename.
|
||||
|
||||
Args:
|
||||
apk_name: The APK filename.
|
||||
|
||||
Returns:
|
||||
The parsed SDK version string.
|
||||
|
||||
Raises:
|
||||
ExternalError: On failing to obtain the min SDK version.
|
||||
"""
|
||||
proc = Run(
|
||||
["aapt", "dump", "badging", apk_name], stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE)
|
||||
stdoutdata, stderrdata = proc.communicate()
|
||||
if proc.returncode != 0:
|
||||
raise ExternalError(
|
||||
"Failed to obtain minSdkVersion: aapt return code {}:\n{}\n{}".format(
|
||||
proc.returncode, stdoutdata, stderrdata))
|
||||
|
||||
p = Run(["aapt", "dump", "badging", apk_name], stdout=subprocess.PIPE)
|
||||
output, err = p.communicate()
|
||||
if err:
|
||||
raise ExternalError("Failed to obtain minSdkVersion: aapt return code %s"
|
||||
% (p.returncode,))
|
||||
|
||||
for line in output.split("\n"):
|
||||
# Looking for lines such as sdkVersion:'23' or sdkVersion:'M'
|
||||
for line in stdoutdata.split("\n"):
|
||||
# Looking for lines such as sdkVersion:'23' or sdkVersion:'M'.
|
||||
m = re.match(r'sdkVersion:\'([^\']*)\'', line)
|
||||
if m:
|
||||
return m.group(1)
|
||||
|
@ -739,11 +752,20 @@ def GetMinSdkVersion(apk_name):
|
|||
|
||||
|
||||
def GetMinSdkVersionInt(apk_name, codename_to_api_level_map):
|
||||
"""Get the minSdkVersion declared in the APK as a number (API Level). If
|
||||
minSdkVersion is set to a codename, it is translated to a number using the
|
||||
provided map.
|
||||
"""
|
||||
"""Returns the minSdkVersion declared in the APK as a number (API Level).
|
||||
|
||||
If minSdkVersion is set to a codename, it is translated to a number using the
|
||||
provided map.
|
||||
|
||||
Args:
|
||||
apk_name: The APK filename.
|
||||
|
||||
Returns:
|
||||
The parsed SDK version number.
|
||||
|
||||
Raises:
|
||||
ExternalError: On failing to get the min SDK version number.
|
||||
"""
|
||||
version = GetMinSdkVersion(apk_name)
|
||||
try:
|
||||
return int(version)
|
||||
|
@ -752,8 +774,9 @@ def GetMinSdkVersionInt(apk_name, codename_to_api_level_map):
|
|||
if version in codename_to_api_level_map:
|
||||
return codename_to_api_level_map[version]
|
||||
else:
|
||||
raise ExternalError("Unknown minSdkVersion: '%s'. Known codenames: %s"
|
||||
% (version, codename_to_api_level_map))
|
||||
raise ExternalError(
|
||||
"Unknown minSdkVersion: '{}'. Known codenames: {}".format(
|
||||
version, codename_to_api_level_map))
|
||||
|
||||
|
||||
def SignFile(input_name, output_name, key, password, min_api_level=None,
|
||||
|
|
|
@ -504,6 +504,23 @@ class CommonApkUtilsTest(unittest.TestCase):
|
|||
actual = common.ParseCertificate(cert_fp.read())
|
||||
self.assertEqual(expected, actual)
|
||||
|
||||
def test_GetMinSdkVersion(self):
|
||||
test_app = os.path.join(self.testdata_dir, 'TestApp.apk')
|
||||
self.assertEqual('24', common.GetMinSdkVersion(test_app))
|
||||
|
||||
def test_GetMinSdkVersion_invalidInput(self):
|
||||
self.assertRaises(
|
||||
common.ExternalError, common.GetMinSdkVersion, 'does-not-exist.apk')
|
||||
|
||||
def test_GetMinSdkVersionInt(self):
|
||||
test_app = os.path.join(self.testdata_dir, 'TestApp.apk')
|
||||
self.assertEqual(24, common.GetMinSdkVersionInt(test_app, {}))
|
||||
|
||||
def test_GetMinSdkVersionInt_invalidInput(self):
|
||||
self.assertRaises(
|
||||
common.ExternalError, common.GetMinSdkVersionInt, 'does-not-exist.apk',
|
||||
{})
|
||||
|
||||
|
||||
class CommonUtilsTest(unittest.TestCase):
|
||||
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue