commit 9dca919ad219bcc093821ec30c14a6df1ef7ede5
author Martin Stjernholm <mast@google.com> Thu Oct 28 03:01:13 2021 +0100
committer Martin Stjernholm <mast@google.com> Tue Nov 09 15:30:21 2021 +0000
tree 570e0dac7340464a3738eedcc03bf533ca565981
parent b747b7aa66e41160e5811ab824f93a38b2bf4ef3

Make art_debug_defaults inherit art_defaults.

To take art_defaults closer to a true global defaults used by
everything in the ART module. This also means we unify the compiler
flags for various debug-only things that didn't inherit art_defaults
explicitly.

#codehealth

Test: Run-tests, gtests, libcore tests and libjdwp tests for host and
  device on master-art
Bug: 204364566
Change-Id: Ic76093f104169fc9178c6b6acca6db23d643f9ec

tools/cpp-define-generator/Android.bp

diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp
index b27ccd6..6b782ee 100644
--- a/tools/cpp-define-generator/Android.bp
+++ b/tools/cpp-define-generator/Android.bp
@@ -28,10 +28,7 @@
     name: "asm_defines.s",
     host_supported: true,
     device_supported: true,
-    defaults: [
-        "art_debug_defaults",
-        "art_defaults",
-    ],
+    defaults: ["art_debug_defaults"],
     header_libs: [
         "art_libartbase_headers", // For base/bit_utils.h
         "jni_headers",