Make dalvikvm inherit art_defaults.
To be able to do changes in art_defaults to affect all native code in
the ART module.
Also clean up some settings now inherited from there.
Test: Presubmits
Bug: 172480615
Change-Id: I81e6a959248eeec6381f32a927d0dbaa47b202ad
diff --git a/dalvikvm/Android.bp b/dalvikvm/Android.bp
index 1b2ac9d..5c0e574 100644
--- a/dalvikvm/Android.bp
+++ b/dalvikvm/Android.bp
@@ -25,15 +25,11 @@
art_cc_binary {
name: "dalvikvm",
+ defaults: ["art_defaults"],
host_supported: true,
compile_multilib: "both",
srcs: ["dalvikvm.cc"],
- cflags: [
- "-Wall",
- "-Werror",
- "-Wextra",
- ],
shared_libs: [
"libnativehelper",
],
@@ -52,9 +48,6 @@
// really be in shared_libs.
whole_static_libs: ["libsigchain"],
},
- darwin: {
- enabled: false,
- },
},
multilib: {
@@ -72,5 +65,4 @@
"com.android.art",
"com.android.art.debug",
],
- min_sdk_version: "S",
}