Inherit art_defaults in cc_library_headers as well.
To take art_defaults closer to a true global defaults used by
everything in the ART module. It has mostly compiler flags which aren't
applicable for header modules, but it may have other things as well,
notably min_sdk_version.
#codehealth
Test: Run-tests, gtests, libcore tests and libjdwp tests for host and
device on master-art
Bug: 204364566
Change-Id: Iba53785a992894fe7e8209a520e7ad9ec32636a2
diff --git a/cmdline/Android.bp b/cmdline/Android.bp
index fdc762c..bf00a85 100644
--- a/cmdline/Android.bp
+++ b/cmdline/Android.bp
@@ -26,6 +26,7 @@
cc_library_headers {
name: "art_cmdlineparser_headers",
+ defaults: ["art_defaults"],
host_supported: true,
export_include_dirs: ["."],
@@ -33,7 +34,6 @@
"com.android.art.debug",
"com.android.art",
],
- min_sdk_version: "S",
}
art_cc_defaults {
diff --git a/dexoptanalyzer/Android.bp b/dexoptanalyzer/Android.bp
index a66bd29..385230b 100644
--- a/dexoptanalyzer/Android.bp
+++ b/dexoptanalyzer/Android.bp
@@ -44,13 +44,13 @@
cc_library_headers {
name: "dexoptanalyzer_headers",
+ defaults: ["art_defaults"],
export_include_dirs: ["."],
host_supported: true,
apex_available: [
"com.android.art.debug",
"com.android.art",
],
- min_sdk_version: "S",
}
art_cc_binary {
diff --git a/disassembler/Android.bp b/disassembler/Android.bp
index 4de4a4f..4b55673 100644
--- a/disassembler/Android.bp
+++ b/disassembler/Android.bp
@@ -121,6 +121,7 @@
cc_library_headers {
name: "art_disassembler_headers",
+ defaults: ["art_defaults"],
host_supported: true,
export_include_dirs: [
".",
@@ -130,5 +131,4 @@
"com.android.art.debug",
"com.android.art",
],
- min_sdk_version: "S",
}
diff --git a/dt_fd_forward/export/Android.bp b/dt_fd_forward/export/Android.bp
index a4e9673..79e97dc 100644
--- a/dt_fd_forward/export/Android.bp
+++ b/dt_fd_forward/export/Android.bp
@@ -25,6 +25,7 @@
cc_library_headers {
name: "dt_fd_forward_export",
+ defaults: ["art_defaults"],
export_include_dirs: ["."],
host_supported: true,
device_supported: true,
@@ -33,5 +34,4 @@
"com.android.art.debug",
"com.android.art",
],
- min_sdk_version: "S",
}
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index fcd2564..8aadef9 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -338,6 +338,7 @@
cc_library_headers {
name: "art_libartbase_headers",
+ defaults: ["art_defaults"],
host_supported: true,
export_include_dirs: ["."],
shared_libs: ["libbase"],
@@ -347,5 +348,4 @@
"com.android.art",
"com.android.art.debug",
],
- min_sdk_version: "S",
}
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 47f2e29..3767696 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -314,6 +314,7 @@
cc_library_headers {
name: "libdexfile_external_headers",
+ defaults: ["art_defaults"],
visibility: ["//visibility:public"],
host_supported: true,
header_libs: ["libbase_headers"],
@@ -333,12 +334,12 @@
"com.android.media",
"com.android.runtime",
],
- min_sdk_version: "S",
}
// Make dex_instruction_list.h available for tools/jvmti-agents/titrace
cc_library_headers {
name: "libdexfile_all_headers",
+ defaults: ["art_defaults"],
visibility: ["//art:__subpackages__"],
host_supported: true,
export_include_dirs: ["."],
@@ -347,7 +348,6 @@
"com.android.art",
"com.android.art.debug",
],
- min_sdk_version: "S",
}
art_cc_test {
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index 8e87997..356a1f4 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -22,7 +22,7 @@
cc_library_headers {
name: "libnativebridge-headers",
-
+ defaults: ["art_defaults"],
host_supported: true,
export_include_dirs: ["include"],
@@ -32,7 +32,6 @@
"com.android.art.debug",
"com.android.media",
],
- min_sdk_version: "S",
}
art_cc_library {
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index 3f13506..6a47b81 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -96,13 +96,13 @@
cc_library_headers {
name: "libnativeloader-headers",
+ defaults: ["art_defaults"],
apex_available: [
"//apex_available:platform",
"com.android.art",
"com.android.art.debug",
"com.android.media",
],
- min_sdk_version: "S",
visibility: [
"//art:__subpackages__",
// TODO(b/133140750): Clean this up.
diff --git a/openjdkjvmti/Android.bp b/openjdkjvmti/Android.bp
index 841a964..b1d5e8a 100644
--- a/openjdkjvmti/Android.bp
+++ b/openjdkjvmti/Android.bp
@@ -46,6 +46,7 @@
cc_library_headers {
name: "libopenjdkjvmti_headers",
+ defaults: ["art_defaults"],
visibility: ["//visibility:public"],
header_libs: ["jni_headers"],
host_supported: true,
@@ -58,7 +59,6 @@
"com.android.art",
"com.android.art.debug",
],
- min_sdk_version: "S",
}
cc_defaults {
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 7d793a6..9e39632 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -68,6 +68,7 @@
cc_library_headers {
name: "libart_headers",
+ defaults: ["art_defaults"],
host_supported: true,
export_include_dirs: ["."],
@@ -95,7 +96,6 @@
"com.android.art",
"com.android.art.debug",
],
- min_sdk_version: "S",
}
libart_cc_defaults {
diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp
index 6b782ee..6e8cd33 100644
--- a/tools/cpp-define-generator/Android.bp
+++ b/tools/cpp-define-generator/Android.bp
@@ -93,6 +93,7 @@
cc_library_headers {
name: "cpp-define-generator-definitions",
+ defaults: ["art_defaults"],
host_supported: true,
export_include_dirs: ["."],
@@ -100,7 +101,6 @@
"com.android.art",
"com.android.art.debug",
],
- min_sdk_version: "S",
}
python_binary_host {