diff options
-rw-r--r-- | cmdline/Android.bp | 2 | ||||
-rw-r--r-- | dexoptanalyzer/Android.bp | 2 | ||||
-rw-r--r-- | disassembler/Android.bp | 2 | ||||
-rw-r--r-- | dt_fd_forward/export/Android.bp | 2 | ||||
-rw-r--r-- | libartbase/Android.bp | 2 | ||||
-rw-r--r-- | libdexfile/Android.bp | 4 | ||||
-rw-r--r-- | libnativebridge/Android.bp | 3 | ||||
-rw-r--r-- | libnativeloader/Android.bp | 2 | ||||
-rw-r--r-- | openjdkjvmti/Android.bp | 2 | ||||
-rw-r--r-- | runtime/Android.bp | 2 | ||||
-rw-r--r-- | tools/cpp-define-generator/Android.bp | 2 |
11 files changed, 12 insertions, 13 deletions
diff --git a/cmdline/Android.bp b/cmdline/Android.bp index fdc762caaa..bf00a85eaa 100644 --- a/cmdline/Android.bp +++ b/cmdline/Android.bp @@ -26,6 +26,7 @@ package { cc_library_headers { name: "art_cmdlineparser_headers", + defaults: ["art_defaults"], host_supported: true, export_include_dirs: ["."], @@ -33,7 +34,6 @@ cc_library_headers { "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 a66bd290fb..385230b16f 100644 --- a/dexoptanalyzer/Android.bp +++ b/dexoptanalyzer/Android.bp @@ -44,13 +44,13 @@ cc_defaults { 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 4de4a4f98b..4b55673bf0 100644 --- a/disassembler/Android.bp +++ b/disassembler/Android.bp @@ -121,6 +121,7 @@ cc_defaults { cc_library_headers { name: "art_disassembler_headers", + defaults: ["art_defaults"], host_supported: true, export_include_dirs: [ ".", @@ -130,5 +131,4 @@ 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 a4e96732cb..79e97dcaf8 100644 --- a/dt_fd_forward/export/Android.bp +++ b/dt_fd_forward/export/Android.bp @@ -25,6 +25,7 @@ package { cc_library_headers { name: "dt_fd_forward_export", + defaults: ["art_defaults"], export_include_dirs: ["."], host_supported: true, device_supported: true, @@ -33,5 +34,4 @@ 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 fcd25645cf..8aadef9139 100644 --- a/libartbase/Android.bp +++ b/libartbase/Android.bp @@ -338,6 +338,7 @@ art_cc_test { cc_library_headers { name: "art_libartbase_headers", + defaults: ["art_defaults"], host_supported: true, export_include_dirs: ["."], shared_libs: ["libbase"], @@ -347,5 +348,4 @@ cc_library_headers { "com.android.art", "com.android.art.debug", ], - min_sdk_version: "S", } diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp index 47f2e29a58..376769693e 100644 --- a/libdexfile/Android.bp +++ b/libdexfile/Android.bp @@ -314,6 +314,7 @@ art_cc_test { cc_library_headers { name: "libdexfile_external_headers", + defaults: ["art_defaults"], visibility: ["//visibility:public"], host_supported: true, header_libs: ["libbase_headers"], @@ -333,12 +334,12 @@ cc_library_headers { "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 @@ cc_library_headers { "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 8e87997b00..356a1f4b48 100644 --- a/libnativebridge/Android.bp +++ b/libnativebridge/Android.bp @@ -22,7 +22,7 @@ cc_defaults { cc_library_headers { name: "libnativebridge-headers", - + defaults: ["art_defaults"], host_supported: true, export_include_dirs: ["include"], @@ -32,7 +32,6 @@ 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 3f13506e33..6a47b8185e 100644 --- a/libnativeloader/Android.bp +++ b/libnativeloader/Android.bp @@ -96,13 +96,13 @@ cc_library { 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 841a964657..b1d5e8a5f0 100644 --- a/openjdkjvmti/Android.bp +++ b/openjdkjvmti/Android.bp @@ -46,6 +46,7 @@ license { cc_library_headers { name: "libopenjdkjvmti_headers", + defaults: ["art_defaults"], visibility: ["//visibility:public"], header_libs: ["jni_headers"], host_supported: true, @@ -58,7 +59,6 @@ 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 7d793a6437..9e39632a66 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -68,6 +68,7 @@ libart_cc_defaults { cc_library_headers { name: "libart_headers", + defaults: ["art_defaults"], host_supported: true, export_include_dirs: ["."], @@ -95,7 +96,6 @@ cc_library_headers { "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 6b782ee655..6e8cd339c8 100644 --- a/tools/cpp-define-generator/Android.bp +++ b/tools/cpp-define-generator/Android.bp @@ -93,6 +93,7 @@ art_module_cc_genrule { cc_library_headers { name: "cpp-define-generator-definitions", + defaults: ["art_defaults"], host_supported: true, export_include_dirs: ["."], @@ -100,7 +101,6 @@ cc_library_headers { "com.android.art", "com.android.art.debug", ], - min_sdk_version: "S", } python_binary_host { |