Merge "Move hardcoded apex_available's for ART modules into ART blueprints." am: af3bf0dd5d am: 122554224f

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1480084

Change-Id: If2bc02791650ee21b2d09a400c96257e134d947c

apex/apex.go

@@ -276,8 +276,6 @@ func makeApexAvailableBaseline() map[string][]string {
 		"libc_malloc_debug_backtrace",
 		"libcamera_client",
 		"libcamera_metadata",
-		"libdexfile_external_headers",
-		"libdexfile_support",
 		"libdvr_headers",
 		"libexpat",
 		"libfifo",
@@ -304,10 +302,6 @@ func makeApexAvailableBaseline() map[string][]string {
 		"libmp4extractor",
 		"libmpeg2extractor",
 		"libnativebase_headers",
-		"libnativebridge-headers",
-		"libnativebridge_lazy",
-		"libnativeloader-headers",
-		"libnativeloader_lazy",
 		"libnativewindow_headers",
 		"libnblog",
 		"liboggextractor",
@@ -431,7 +425,6 @@ func makeApexAvailableBaseline() map[string][]string {
 		"libcodec2_soft_vp9dec",
 		"libcodec2_soft_vp9enc",
 		"libcodec2_vndk",
-		"libdexfile_support",
 		"libdvr_headers",
 		"libfmq",
 		"libfmq",
@@ -454,8 +447,6 @@ func makeApexAvailableBaseline() map[string][]string {
 		"libmedia_headers",
 		"libmpeg2dec",
 		"libnativebase_headers",
-		"libnativebridge_lazy",
-		"libnativeloader_lazy",
 		"libnativewindow_headers",
 		"libpdx_headers",
 		"libscudo_wrapper",
@@ -563,8 +554,6 @@ func makeApexAvailableBaseline() map[string][]string {
 		"libdebuggerd_common_headers",
 		"libdebuggerd_handler_core",
 		"libdebuggerd_handler_fallback",
-		"libdexfile_external_headers",
-		"libdexfile_support",
 		"libdl_static",
 		"libjemalloc5",
 		"liblinker_main",