Add sunflower to run_on_app_dumps
Contents of README.google:
Name: Sunflower
URL: https://github.com/android/sunflower
Version: NA
Revision: 0c4c88fdad2a74791199dffd1a6559559b1dbd4a
Date: Oct 15, 2020
License: Apache License 2.0
Bug: 152155164
Change-Id: I6000ad5d4d6d83a1a6ac045cd9ea8866ecdf03ad
diff --git a/.gitignore b/.gitignore
index ac086fa..0689f3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,6 +136,8 @@
third_party/opensource-apps/chanu.tar.gz
third_party/opensource-apps/friendlyeats
third_party/opensource-apps/friendlyeats.tar.gz
+third_party/opensource-apps/sunflower
+third_party/opensource-apps/sunflower.tar.gz
third_party/opensource-apps/wikipedia
third_party/opensource-apps/wikipedia.tar.gz
third_party/opensource_apps
diff --git a/third_party/opensource-apps/sunflower.tar.gz.sha1 b/third_party/opensource-apps/sunflower.tar.gz.sha1
new file mode 100644
index 0000000..06aec6d
--- /dev/null
+++ b/third_party/opensource-apps/sunflower.tar.gz.sha1
@@ -0,0 +1 @@
+52fe1160095f2f46d13782dc19d5201792ac2ec1
\ No newline at end of file
diff --git a/tools/run_on_app_dump.py b/tools/run_on_app_dump.py
index 56d8a18..cd09ad6 100755
--- a/tools/run_on_app_dump.py
+++ b/tools/run_on_app_dump.py
@@ -126,6 +126,21 @@
'folder': 'friendlyeats',
}),
App({
+ 'id': 'com.google.samples.apps.sunflower',
+ 'name': 'Sunflower',
+ 'dump_app': 'dump_app.zip',
+ 'apk_app': 'app-debug.apk',
+ # TODO(b/172549283): Compiling tests fails
+ 'id_test': 'com.example.applymapping.test',
+ 'dump_test': 'dump_test.zip',
+ 'apk_test': 'app-debug-androidTest.apk',
+ 'url': 'https://github.com/android/sunflower',
+ 'revision': '0c4c88fdad2a74791199dffd1a6559559b1dbd4a',
+ 'folder': 'sunflower',
+ # TODO(b/172548728): Fix recompilation
+ 'skip_recompilation': True
+ }),
+ App({
'id': 'org.wikipedia',
'name': 'Wikipedia',
'dump_app': 'dump_app.zip',
@@ -262,7 +277,6 @@
and not is_last_build(compilation_step, compilation_steps)):
result['recompilation_status'] = 'failed'
warn('Failed to build {} with {}'.format(app.name, shrinker))
- break
recomp_jar = new_recomp_jar
except Exception as e:
warn('Failed to build {} with {}'.format(app.name, shrinker))
@@ -300,18 +314,21 @@
test_jar = build_test_with_shrinker(
app, options, temp_dir, app_dir,shrinker, compilation_step,
result['output_mapping'])
- original_test_apk = os.path.join(app_dir, app.apk_test)
- test_apk_destination = os.path.join(
- temp_dir,"{}_{}.test.apk".format(app.id_test, compilation_step))
- apk_masseur.masseur(
- original_test_apk, dex=test_jar, resources='META-INF/services/*',
- out=test_apk_destination,
- quiet=options.quiet, logging=is_logging_enabled_for(app, options),
- keystore=options.keystore)
- result['instrumentation_test_status'] = 'success' if adb.run_instrumented(
- app.id, app.id_test, options.emulator_id, app_apk_destination,
- test_apk_destination, options.quiet,
- is_logging_enabled_for(app, options)) else 'failed'
+ if not test_jar:
+ result['instrumentation_test_status'] = 'compilation_failed'
+ else:
+ original_test_apk = os.path.join(app_dir, app.apk_test)
+ test_apk_destination = os.path.join(
+ temp_dir,"{}_{}.test.apk".format(app.id_test, compilation_step))
+ apk_masseur.masseur(
+ original_test_apk, dex=test_jar, resources='META-INF/services/*',
+ out=test_apk_destination,
+ quiet=options.quiet, logging=is_logging_enabled_for(app, options),
+ keystore=options.keystore)
+ result['instrumentation_test_status'] = 'success' if adb.run_instrumented(
+ app.id, app.id_test, options.emulator_id, app_apk_destination,
+ test_apk_destination, options.quiet,
+ is_logging_enabled_for(app, options)) else 'failed'
results.append(result)
if result.get('recompilation_status') != 'success':
@@ -365,6 +382,7 @@
return (app_jar, app_mapping, recomp_jar)
+
def build_test_with_shrinker(app, options, temp_dir, app_dir, shrinker,
compilation_step_index, mapping):
r8jar = os.path.join(
@@ -401,7 +419,8 @@
app.name, shrinker, compilation_step_index))
if compile_result != 0 or not os.path.isfile(out_jar):
- assert False, "Compilation of test_jar failed"
+ return None
+
shutil.move(out_jar, test_jar)
return test_jar
