Revert "CwPerformanceLaunch checked in to avoid sideload"
This reverts commit df5b5b6e306ce75bd98c9592f3867aa7831a49a2.
Change-Id: Ia827eeae085ce86e3984459572ce6efb88b289a9
diff --git a/tests/perf/PerformanceLaunch/AndroidManifest.xml b/tests/perf/PerformanceLaunch/AndroidManifest.xml
index 99ee3be..6d639ad 100644
--- a/tests/perf/PerformanceLaunch/AndroidManifest.xml
+++ b/tests/perf/PerformanceLaunch/AndroidManifest.xml
@@ -29,7 +29,6 @@
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
- android:debuggable="true"
android:theme="@style/AppTheme" >
<activity
android:name=".DispatchActivity"
diff --git a/tests/perf/PerformanceLaunch/res/values-round/styles.xml b/tests/perf/PerformanceLaunch/res/values-round/styles.xml
deleted file mode 100644
index 7c63606..0000000
--- a/tests/perf/PerformanceLaunch/res/values-round/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<resources>
-
- <!--
- Base application theme, dependent on API level. This theme is replaced
- by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
- -->
- <style name="AppBaseTheme" parent="android:Theme.Light">
- <!--
- Theme customizations available in newer API levels can go in
- res/values-vXX/styles.xml, while customizations related to
- backward-compatibility can go here.
- -->
- </style>
-
- <!-- Application theme. -->
- <style name="AppTheme" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen">
- <!-- All customizations that are NOT specific to a particular API-level can go here. -->
- </style>
-
-</resources>
diff --git a/tests/perf/PerformanceLaunch/src/com/android/performanceLaunch/DispatchActivity.java b/tests/perf/PerformanceLaunch/src/com/android/performanceLaunch/DispatchActivity.java
index 7c42ce8..4a3da34 100644
--- a/tests/perf/PerformanceLaunch/src/com/android/performanceLaunch/DispatchActivity.java
+++ b/tests/perf/PerformanceLaunch/src/com/android/performanceLaunch/DispatchActivity.java
@@ -72,11 +72,11 @@
try {
mPid = android.os.Process.myPid();
ProcessBuilder simpleperf =
- new ProcessBuilder(mSimpleperfBin, "stat",
+ new ProcessBuilder(mSimpleperfBin, "stat", "--group",
mSimpleperfEvt, "-p", String.valueOf(mPid));
- simpleperf.redirectOutput(new File(String.format("%s/%s-%s",
- mSimpleperfDir, mActivityName, String.valueOf(mPid))));
+ simpleperf.redirectOutput(new File(String.format("%s/%s.%s",
+ mSimpleperfDir, "perf.data", String.valueOf(mPid))));
simpleperf.start();
} catch (Exception e) {
