Inherit art_defaults in some recently added native libraries.
It's useful to have a place to add flags that should cover all ART
code, so keep it that way as far as possible.
Test: m
Bug: 178236337
Bug: 177273468
Change-Id: I66796e89f054705c4af5fab867a3b8b715a83937
diff --git a/libartservice/Android.bp b/libartservice/Android.bp
index 1ccd99a..66fb146 100644
--- a/libartservice/Android.bp
+++ b/libartservice/Android.bp
@@ -26,6 +26,7 @@
// Language library.
name: "libartservice",
+ defaults: ["art_defaults"],
host_supported: true,
srcs: [
"service/native/service.cc",
@@ -35,12 +36,10 @@
"com.android.art",
"com.android.art.debug",
],
- min_sdk_version: "S",
shared_libs: [
"libbase",
],
export_shared_lib_headers: ["libbase"],
- cflags: ["-Werror"],
}
java_library {
diff --git a/libarttools/Android.bp b/libarttools/Android.bp
index 669826e..5e654bb 100644
--- a/libarttools/Android.bp
+++ b/libarttools/Android.bp
@@ -30,6 +30,7 @@
// Service to make use of this functionality.
name: "libarttools",
+ defaults: ["art_defaults"],
host_supported: true,
srcs: [
"tools/tools.cc",
@@ -39,7 +40,6 @@
"com.android.art",
"com.android.art.debug",
],
- min_sdk_version: "S",
shared_libs: [
"libbase",
],
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 24f431e..3de88d7 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -878,12 +878,9 @@
cc_library_static {
name: "libstatslog_art",
+ defaults: ["art_defaults"],
generated_sources: ["statslog_art.cpp"],
generated_headers: ["statslog_art.h"],
- cflags: [
- "-Wall",
- "-Werror",
- ],
export_generated_headers: ["statslog_art.h"],
shared_libs: [
"liblog",
@@ -894,7 +891,6 @@
"com.android.art",
"com.android.art.debug",
],
- min_sdk_version: "S",
}
genrule {