diff options
| -rw-r--r-- | libdexfile/Android.bp | 9 | ||||
| -rw-r--r-- | test/Android.bp | 24 |
2 files changed, 0 insertions, 33 deletions
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp index 5b859c2f05..69d51b6c01 100644 --- a/libdexfile/Android.bp +++ b/libdexfile/Android.bp @@ -398,9 +398,6 @@ 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 @@ -543,9 +540,6 @@ 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. @@ -611,9 +605,6 @@ 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 226e182498..63840648ca 100644 --- a/test/Android.bp +++ b/test/Android.bp @@ -86,12 +86,6 @@ cc_defaults { relative_install_path: "art/x86_64", }, }, - // 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", - ], } // Variant of art_test_defaults for test libraries that installs them in a @@ -544,9 +538,6 @@ 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 { @@ -576,9 +567,6 @@ 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 { @@ -822,9 +810,6 @@ 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 { @@ -854,9 +839,6 @@ 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 { @@ -968,9 +950,6 @@ 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 { @@ -1015,9 +994,6 @@ 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 { |