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
diff --git a/benchmark/Android.bp b/benchmark/Android.bp
index 342fae8..d781f84 100644
--- a/benchmark/Android.bp
+++ b/benchmark/Android.bp
@@ -59,10 +59,7 @@
name: "libartbenchmark-micronative-host",
host_supported: true,
device_supported: false,
- defaults: [
- "art_debug_defaults",
- "art_defaults",
- ],
+ defaults: ["art_debug_defaults"],
srcs: [
"jni_loader.cc",
"micro-native/micro_native.cc",
diff --git a/build/Android.bp b/build/Android.bp
index e54e2d3..4d83fcc 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -307,6 +307,7 @@
art_debug_defaults {
name: "art_debug_defaults",
+ defaults: ["art_defaults"],
visibility: ["//art:__subpackages__"],
cflags: [
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
@@ -327,8 +328,6 @@
cflags: ["-Wno-frame-larger-than="],
},
},
-
- min_sdk_version: "S",
}
// A version of conscrypt only for enabling the "-hostdex" version to test ART on host.
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index d377bbb..531c0f5 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -181,7 +181,6 @@
host_supported: true,
defaults: [
"art_debug_defaults",
- "art_defaults",
"libartbased_static_defaults",
"libartd-compiler_static_defaults",
"libartd-dex2oat_static_defaults",
diff --git a/profman/Android.bp b/profman/Android.bp
index 917d79a..8069a4b 100644
--- a/profman/Android.bp
+++ b/profman/Android.bp
@@ -76,7 +76,6 @@
host_supported: true,
defaults: [
"art_debug_defaults",
- "art_defaults",
"libartbased_static_defaults",
"libdexfiled_static_defaults",
"libprofiled_static_defaults",
diff --git a/test/Android.bp b/test/Android.bp
index 45f4042..f3fb289 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -194,7 +194,6 @@
"art_test_defaults",
"art_gtest_common_defaults",
"art_debug_defaults",
- "art_defaults",
],
test_suites: ["art-host-tests"],
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",
diff --git a/tools/create_minidebuginfo/Android.bp b/tools/create_minidebuginfo/Android.bp
index 95ac702..e78beef 100644
--- a/tools/create_minidebuginfo/Android.bp
+++ b/tools/create_minidebuginfo/Android.bp
@@ -25,10 +25,7 @@
art_cc_binary {
name: "create_minidebuginfo",
- defaults: [
- "art_debug_defaults",
- "art_defaults",
- ],
+ defaults: ["art_debug_defaults"],
host_supported: true,
device_supported: false,
srcs: [