Skip KernelAddressSymbolization on non-debuggable builds
The previous attempt at fixing this using build-time detection
was wrong. CTS package can be built as part of a "user" lunch
combo, but can be run on a userdebug image (and viceversa).
This moves the logic to run-time detection.
Bug: 172272291
Change-Id: Ia46ca9c2f8b7d918bf576adad60c72a0d6d8a782
diff --git a/Android.bp b/Android.bp
index 87b5561..332bbc4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1037,7 +1037,6 @@
"test/cts/heapprofd_java_test_cts.cc",
"test/cts/heapprofd_test_cts.cc",
"test/cts/traced_perf_test_cts.cc",
- "test/cts/utils.cc",
],
static_libs: [
"libgmock",
@@ -8074,6 +8073,7 @@
filegroup {
name: "perfetto_test_test_helper",
srcs: [
+ "test/android_test_utils.cc",
"test/fake_producer.cc",
"test/test_helper.cc",
],