Add min_sdk_version for ART module.

Bug: 180399951
Test: m
Change-Id: I5e2a1ddc3063be26c602bf4db8e6b77f2d54b656

16 files changed, 23 insertions, 1 deletions

diff --git a/build/Android.bp b/build/Android.bp
index 1caf6202b8..c846b72684 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -230,6 +230,8 @@ art_global_defaults {
         // will still get the "real" errors.
         "-extra-arg=-Wno-unreachable-code",
     ],
+
+    min_sdk_version: "S",
 }
 
 cc_defaults {
@@ -284,6 +286,8 @@ art_debug_defaults {
             cflags: ["-Wno-frame-larger-than="],
         },
     },
+
+    min_sdk_version: "S",
 }
 
 soong_config_module_type_import {
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 2db3264476..555fd8204a 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -278,6 +278,7 @@ apex_defaults {
             enabled: false,
         },
     },
+    min_sdk_version: "S",
 }
 
 // Default values shared by (device) Debug and Testing ART APEXes.
diff --git a/cmdline/Android.bp b/cmdline/Android.bp
index d66b40a9c4..741722f38d 100644
--- a/cmdline/Android.bp
+++ b/cmdline/Android.bp
@@ -33,6 +33,7 @@ cc_library_headers {
         "com.android.art.debug",
         "com.android.art",
     ],
+    min_sdk_version: "S",
 }
 
 art_cc_test {
diff --git a/dalvikvm/Android.bp b/dalvikvm/Android.bp
index f1912d0f6c..7c83cd4dfb 100644
--- a/dalvikvm/Android.bp
+++ b/dalvikvm/Android.bp
@@ -67,4 +67,5 @@ art_cc_binary {
         "com.android.art",
         "com.android.art.debug",
     ],
+    min_sdk_version: "S",
 }
diff --git a/dexoptanalyzer/Android.bp b/dexoptanalyzer/Android.bp
index b4144a262c..02c385a582 100644
--- a/dexoptanalyzer/Android.bp
+++ b/dexoptanalyzer/Android.bp
@@ -51,6 +51,7 @@ cc_library_headers {
         "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 838d52c4a5..6682fd779c 100644
--- a/disassembler/Android.bp
+++ b/disassembler/Android.bp
@@ -111,4 +111,5 @@ cc_library_headers {
         "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 03f89449e1..a4e96732cb 100644
--- a/dt_fd_forward/export/Android.bp
+++ b/dt_fd_forward/export/Android.bp
@@ -33,4 +33,5 @@ cc_library_headers {
         "com.android.art.debug",
         "com.android.art",
     ],
+    min_sdk_version: "S",
 }
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 364497e538..c430c31e7e 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -294,4 +294,5 @@ cc_library_headers {
         "com.android.art",
         "com.android.art.debug",
     ],
+    min_sdk_version: "S",
 }
diff --git a/libartservice/Android.bp b/libartservice/Android.bp
index 8de39f2297..1ccd99ad7d 100644
--- a/libartservice/Android.bp
+++ b/libartservice/Android.bp
@@ -35,6 +35,7 @@ cc_library {
         "com.android.art",
         "com.android.art.debug",
     ],
+    min_sdk_version: "S",
     shared_libs: [
         "libbase",
     ],
@@ -55,8 +56,8 @@ java_library {
         "com.android.art",
         "com.android.art.debug",
     ],
-
     sdk_version: "core_platform",
+    min_sdk_version: "31",
 
     srcs: [
         "service/java/com/android/server/art/ArtService.java",
diff --git a/libarttools/Android.bp b/libarttools/Android.bp
index 10984ed009..669826e34e 100644
--- a/libarttools/Android.bp
+++ b/libarttools/Android.bp
@@ -39,6 +39,7 @@ cc_library {
         "com.android.art",
         "com.android.art.debug",
     ],
+    min_sdk_version: "S",
     shared_libs: [
         "libbase",
     ],
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index bf631e9acc..63f2827c26 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -287,6 +287,7 @@ cc_library_headers {
         "com.android.media",
         "com.android.runtime",
     ],
+    min_sdk_version: "S",
 }
 
 // Make dex_instruction_list.h available for tools/jvmti-agents/titrace
@@ -300,6 +301,7 @@ cc_library_headers {
         "com.android.art",
         "com.android.art.debug",
     ],
+    min_sdk_version: "S",
 }
 
 cc_defaults {
@@ -405,6 +407,7 @@ art_cc_library {
         "com.android.media.swcodec",
         "com.android.runtime",
     ],
+    min_sdk_version: "S",
 }
 
 art_cc_test {
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index 9f65eb6f36..cb07d35363 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -35,6 +35,7 @@ cc_library_headers {
         "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 70f89ffe28..316c087453 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -105,6 +105,7 @@ cc_library_headers {
         "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 5aa40d5601..841a964657 100644
--- a/openjdkjvmti/Android.bp
+++ b/openjdkjvmti/Android.bp
@@ -58,6 +58,7 @@ cc_library_headers {
         "com.android.art",
         "com.android.art.debug",
     ],
+    min_sdk_version: "S",
 }
 
 cc_defaults {
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 403a4c33ea..24f431e837 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -779,6 +779,7 @@ cc_library_headers {
         "com.android.art",
         "com.android.art.debug",
     ],
+    min_sdk_version: "S",
 }
 
 genrule {
@@ -893,6 +894,7 @@ cc_library_static {
         "com.android.art",
         "com.android.art.debug",
     ],
+    min_sdk_version: "S",
 }
 
 genrule {
diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp
index 64d2a3c453..5c9e4f95f3 100644
--- a/tools/cpp-define-generator/Android.bp
+++ b/tools/cpp-define-generator/Android.bp
@@ -85,6 +85,7 @@ cc_library_headers {
         "com.android.art",
         "com.android.art.debug",
     ],
+    min_sdk_version: "S",
 }
 
 python_binary_host {