From 9dca919ad219bcc093821ec30c14a6df1ef7ede5 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Thu, 28 Oct 2021 03:01:13 +0100 Subject: 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 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tools/cpp-define-generator/Android.bp') diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp index b27ccd6611..6b782ee655 100644 --- a/tools/cpp-define-generator/Android.bp +++ b/tools/cpp-define-generator/Android.bp @@ -28,10 +28,7 @@ cc_object { 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", -- cgit v1.2.3-59-g8ed1b