Merge "Disable profilable CTS test."
diff --git a/test/cts/AndroidTest.xml b/test/cts/AndroidTest.xml
index d34d264..a6deef2 100644
--- a/test/cts/AndroidTest.xml
+++ b/test/cts/AndroidTest.xml
@@ -24,7 +24,6 @@
<option name="test-file-name" value="CtsPerfettoProducerApp.apk" />
<option name="test-file-name" value="CtsPerfettoDebuggableApp.apk" />
<option name="test-file-name" value="CtsPerfettoReleaseApp.apk" />
- <option name="test-file-name" value="CtsPerfettoProfileableApp.apk" />
</target_preparer>
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
diff --git a/test/cts/heapprofd_java_test_cts.cc b/test/cts/heapprofd_java_test_cts.cc
index ae5a18a..010404b 100644
--- a/test/cts/heapprofd_java_test_cts.cc
+++ b/test/cts/heapprofd_java_test_cts.cc
@@ -105,7 +105,7 @@
AssertGraphPresent(packets);
}
-TEST(HeapprofdJavaCtsTest, ProfileableAppRuntime) {
+TEST(HeapprofdJavaCtsTest, DISABLED_ProfileableAppRuntime) {
std::string app_name = "android.perfetto.cts.app.profileable";
const auto& packets = ProfileRuntime(app_name);
AssertGraphPresent(packets);
diff --git a/test/cts/heapprofd_test_apps/Android.bp b/test/cts/heapprofd_test_apps/Android.bp
index bc2b323..e759410 100644
--- a/test/cts/heapprofd_test_apps/Android.bp
+++ b/test/cts/heapprofd_test_apps/Android.bp
@@ -51,23 +51,3 @@
"libnativehelper_compat_libc++",
],
}
-
-android_test_helper_app {
- name: "CtsPerfettoProfileableApp",
- // tag this module as a cts test artifact
- test_suites: [
- "cts",
- "vts",
- "general-tests",
- ],
-
- manifest: "AndroidManifest_profileable.xml",
-
- compile_multilib: "both",
- srcs: ["src/**/*.java"],
- sdk_version: "current",
- jni_libs: [
- "libperfettocts_heapprofdtarget",
- "libnativehelper_compat_libc++",
- ],
-}
diff --git a/test/cts/heapprofd_test_cts.cc b/test/cts/heapprofd_test_cts.cc
index 739f303..bd9c49a 100644
--- a/test/cts/heapprofd_test_cts.cc
+++ b/test/cts/heapprofd_test_cts.cc
@@ -175,14 +175,14 @@
StopApp(app_name);
}
-TEST(HeapprofdCtsTest, ProfileableAppRuntime) {
+TEST(HeapprofdCtsTest, DISABLED_ProfileableAppRuntime) {
std::string app_name = "android.perfetto.cts.app.profileable";
const auto& packets = ProfileRuntime(app_name);
AssertExpectedAllocationsPresent(packets);
StopApp(app_name);
}
-TEST(HeapprofdCtsTest, ProfileableAppStartup) {
+TEST(HeapprofdCtsTest, DISABLED_ProfileableAppStartup) {
std::string app_name = "android.perfetto.cts.app.profileable";
const auto& packets = ProfileStartup(app_name);
AssertExpectedAllocationsPresent(packets);
