diff options
| -rw-r--r-- | libdexfile/Android.bp | 9 | ||||
| -rw-r--r-- | test/Android.bp | 19 |
2 files changed, 28 insertions, 0 deletions
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp index 69d51b6c01..5b859c2f05 100644 --- a/libdexfile/Android.bp +++ b/libdexfile/Android.bp @@ -398,6 +398,9 @@ art_cc_test { "art_test_defaults", "art_libdexfile_external_tests_defaults", ], + // TODO(b/395617594): This can be removed when apex_available is removed + // from art_test_defaults. + apex_available: ["//apex_available:platform"], } // Standalone version of ART gtest `art_libdexfile_external_tests`, not bundled with the ART APEX on @@ -540,6 +543,9 @@ art_cc_test { srcs: [ "external/dex_file_supp_test.cc", ], + // TODO(b/395617594): This can be removed when apex_available is removed + // from art_test_defaults. + apex_available: ["//apex_available:platform"], } // For use by external packages allowed to link in static libdexfile_support. @@ -605,6 +611,9 @@ art_cc_test { sanitize: { misc_undefined: ["shift"], }, + // TODO(b/395617594): This can be removed when apex_available is removed + // from art_test_defaults. + apex_available: ["//apex_available:platform"], } filegroup { diff --git a/test/Android.bp b/test/Android.bp index e7e37f6c7c..226e182498 100644 --- a/test/Android.bp +++ b/test/Android.bp @@ -88,6 +88,7 @@ cc_defaults { }, // Tests aren't generally included in any APEX, but this is necessary to // avoid duplicate install rules for them by making them unavailable to platform. + // TODO(b/395617594): Figure out why this is necessary and remove it. apex_available: [ "com.android.art.debug", ], @@ -543,6 +544,9 @@ art_cc_defaults { defaults: ["art_test_defaults"], header_libs: ["libnativebridge-headers"], srcs: ["115-native-bridge/nativebridge.cc"], + // TODO(b/395617594): This can be removed when apex_available is removed + // from art_test_defaults. + apex_available: ["//apex_available:platform"], } art_cc_test_library { @@ -572,6 +576,9 @@ cc_defaults { "liblog", "libnativehelper", ], + // TODO(b/395617594): This can be removed when apex_available is removed + // from art_test_defaults. + apex_available: ["//apex_available:platform"], } art_cc_test_library { @@ -815,6 +822,9 @@ art_cc_defaults { "slicer_no_rtti", "libz", // for slicer (using adler32). ], + // TODO(b/395617594): This can be removed when apex_available is removed + // from art_test_defaults. + apex_available: ["//apex_available:platform"], } art_cc_test_library { @@ -844,6 +854,9 @@ art_cc_defaults { "libtistress-srcs", ], static_libs: ["slicer_no_rtti"], + // TODO(b/395617594): This can be removed when apex_available is removed + // from art_test_defaults. + apex_available: ["//apex_available:platform"], } art_cc_test_library { @@ -955,6 +968,9 @@ cc_defaults { shared_libs: ["libdl_android"], }, }, + // TODO(b/395617594): This can be removed when apex_available is removed + // from art_test_defaults. + apex_available: ["//apex_available:platform"], } art_cc_test_library { @@ -999,6 +1015,9 @@ cc_defaults { "liblog", "libnativehelper", ], + // TODO(b/395617594): This can be removed when apex_available is removed + // from art_test_defaults. + apex_available: ["//apex_available:platform"], } art_cc_test_library { |