Perfprofd: Add debug version of libperfprofdcore

Add libperfprofdcored for the tests.

(cherry picked from commit b5c370917ae02262fa3c119c596537b57a8ff6ac)

Bug: 73175642
Test: mmma system/extras/perfprofd
Test: perfprofd_tests
Merged-In: I5e7047d80495f6ce832892d3d488104da318fe02
Change-Id: I5e7047d80495f6ce832892d3d488104da318fe02

3 files changed, 35 insertions, 15 deletions

diff --git a/perfprofd/Android.bp b/perfprofd/Android.bp
index 500826ce..351c7aab 100644
--- a/perfprofd/Android.bp
+++ b/perfprofd/Android.bp
@@ -41,12 +41,22 @@ cc_defaults {
     ],
 }
 
+cc_defaults {
+    name: "perfprofd_debug_defaults",
+
+    cflags: [
+        "-O0",
+        "-g",
+        "-UNDEBUG",
+    ],
+}
+
 //
 // Static library containing guts of AWP daemon.
 //
 
-cc_library_static {
-    name: "libperfprofdcore",
+cc_defaults {
+    name: "libperfprofdcore_defaults",
     defaults: [
         "perfprofd_defaults",
     ],
@@ -59,7 +69,6 @@ cc_library_static {
 
     static_libs: [
         "libbase",
-        "libquipper",
         "libsimpleperf_elf_read",
     ],
     whole_static_libs: [
@@ -85,9 +94,25 @@ cc_library_static {
     ],
 
     export_include_dirs: ["."],
-    export_static_lib_headers: ["libquipper"],
 }
 
+cc_library_static {
+    name: "libperfprofdcore",
+    defaults: [
+        "libperfprofdcore_defaults",
+    ],
+}
+
+// Debug version.
+cc_library_static {
+    name: "libperfprofdcored",
+    defaults: [
+        "libperfprofdcore_defaults",
+        "perfprofd_debug_defaults",
+    ],
+}
+
+
 //
 // Main daemon
 //
diff --git a/perfprofd/tests/Android.bp b/perfprofd/tests/Android.bp
index c245ff6c..7d0b7061 100644
--- a/perfprofd/tests/Android.bp
+++ b/perfprofd/tests/Android.bp
@@ -2,16 +2,9 @@
 
 cc_defaults {
     name: "perfprofd_test_defaults",
-
-    cflags: [
-        "-Wall",
-        "-Werror",
-        "-O0",
-        "-g",
-    ],
-    cppflags: [
-        "-Wno-sign-compare",
-        "-Wno-unused-parameter",
+    defaults: [
+        "perfprofd_defaults",
+        "perfprofd_debug_defaults",
     ],
 
     strip: {
@@ -32,7 +25,7 @@ cc_test {
 
     stl: "libc++",
     static_libs: [
-        "libperfprofdcore",
+        "libperfprofdcored",
         "libsimpleperf_elf_read",
         "libbase",
         "libutils",
diff --git a/perfprofd/tests/perfprofd_test.cc b/perfprofd/tests/perfprofd_test.cc
index 73ee638f..5e8a0e3b 100644
--- a/perfprofd/tests/perfprofd_test.cc
+++ b/perfprofd/tests/perfprofd_test.cc
@@ -49,6 +49,8 @@
 
 using namespace android::perfprofd::quipper;
 
+static_assert(android::base::kEnableDChecks, "Expected DCHECKs to be enabled");
+
 //
 // Set to argv[0] on startup
 //