Make various native modules depend on art_defaults.
To be able to do changes in art_defaults to affect all native code in
the ART module.
(Note that art_debug_defaults does not imply art_defaults.)
Test: Presubmits
Bug: 172480615
Change-Id: Ib1a43358fe0f85f601a8606969a10d50a25f0b31
diff --git a/libelffile/Android.bp b/libelffile/Android.bp
index 721a479..8281068 100644
--- a/libelffile/Android.bp
+++ b/libelffile/Android.bp
@@ -25,6 +25,7 @@
art_cc_defaults {
name: "libelffile-defaults",
+ defaults: ["art_defaults"],
host_supported: true,
export_include_dirs: ["."],
srcs: [
@@ -43,7 +44,6 @@
art_cc_library_static {
name: "libelffile",
defaults: [
- "art_defaults",
"libelffile-defaults",
],
shared_libs: [
diff --git a/profman/Android.bp b/profman/Android.bp
index 01e9226..1b79713 100644
--- a/profman/Android.bp
+++ b/profman/Android.bp
@@ -77,6 +77,7 @@
host_supported: true,
defaults: [
"art_debug_defaults",
+ "art_defaults",
"libartbased_static_defaults",
"libdexfiled_static_defaults",
"libprofiled_static_defaults",
diff --git a/tools/jvmti-agents/simple-profile/Android.bp b/tools/jvmti-agents/simple-profile/Android.bp
index b4021d1..12d0aeb 100644
--- a/tools/jvmti-agents/simple-profile/Android.bp
+++ b/tools/jvmti-agents/simple-profile/Android.bp
@@ -50,6 +50,7 @@
cc_defaults {
name: "simpleprofile-defaults",
+ defaults: ["simpleprofile-base-defaults"],
shared_libs: [
"libbase",
],