Update tools/build_sample_apk.py
Fix allowed parameters for api level
Allow removal of META-INF to fail if it is not there
Don't pass guava if we are building the simple app (that does not use guava)
Bug: 148441055
Change-Id: I2e2ef61c16e55280f043e2ac7097ec97bab257f6
diff --git a/tools/apk_utils.py b/tools/apk_utils.py
index 69a9db9..9155657 100644
--- a/tools/apk_utils.py
+++ b/tools/apk_utils.py
@@ -10,7 +10,7 @@
def sign(unsigned_apk, signed_apk, keystore, quiet=False, logging=True):
utils.Print('Signing (ignore the warnings)', quiet=quiet)
cmd = ['zip', '-d', unsigned_apk, 'META-INF/*']
- utils.RunCmd(cmd, quiet=quiet, logging=logging)
+ utils.RunCmd(cmd, quiet=quiet, logging=logging, fail=False)
cmd = [
'jarsigner',
'-sigalg', 'SHA1withRSA',
diff --git a/tools/build_sample_apk.py b/tools/build_sample_apk.py
index 29f7459..c035520 100755
--- a/tools/build_sample_apk.py
+++ b/tools/build_sample_apk.py
@@ -42,7 +42,8 @@
result.add_option('--api',
help='Android api level',
default=21,
- choices=[14, 15, 19, 21, 22, 23, 24, 25, 26])
+ choices=['14', '15', '19', '21', '22', '23', '24', '25',
+ '26'])
result.add_option('--keystore',
help='Keystore used for signing',
default=DEFAULT_KEYSTORE)
@@ -156,7 +157,8 @@
'--classpath', utils.get_android_jar(api),
'--min-api', str(api)]
command.extend(files)
- command.append(get_guava_jar())
+ if app != 'simple':
+ command.append(get_guava_jar())
utils.PrintCmd(command)
subprocess.check_call(command)
