commit afb9b08dd8db25026f29b4882b885fea13979b70
author Eric Holk <eholk@google.com> Wed Nov 13 15:24:40 2019 -0800
committer Eric Holk <eholk@google.com> Thu Nov 14 17:29:08 2019 +0000
tree 9e4f2dea2125cb56c1f0a3bd0e3632b153d4938c
parent c4584294e5b2e00c92db8a05273e888ee93ee2ef

Refactor interactive microbenchmarks

Replaces the SystemServer Benchmark activity with one that has
several sets of benchmarks grouped into categories. This will make it
easier to add more benchmarks that do not logically fit with the
categories we already have.

This does not remove any of the other benchmark activities, but in a
follow up CL, we should remove those since they are covered by the
Interactive Microbenchmarks activity.

This also does not adjust the non-interactive mode, which should also
happen in a followup.

Change-Id: I1d079362df0d32642525ede5b41779d76a5735ec

startop/apps/test/Android.bp

diff --git a/startop/apps/test/Android.bp b/startop/apps/test/Android.bp
index 3f20273..c7c70db 100644
--- a/startop/apps/test/Android.bp
+++ b/startop/apps/test/Android.bp
@@ -25,8 +25,8 @@
         "src/InitCheckOverheadBenchmarkActivity.java",
         "src/InitCheckOverheadBenchmarks.java",
         "src/LayoutInflationActivity.java",
-        "src/NonInteractiveSystemServerBenchmarkActivity.java",
-        "src/SystemServerBenchmarkActivity.java",
+        "src/NonInteractiveMicrobenchmarkActivity.java",
+        "src/InteractiveMicrobenchmarkActivity.java",
         "src/SystemServerBenchmarks.java",
         "src/TextViewInflationActivity.java",
     ],