From 377d752a6b72378e1bd896476e5d357fdde71d88 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Fri, 30 Oct 2020 02:17:23 +0000
Subject: [PATCH] Move hardcoded apex_available's for ART modules into ART
 blueprints.

Test: m droid
Bug: 133140750
Change-Id: I7280c7c61979d8f1aa3c849ff7079a5dd3ef216d
---
 apex/apex.go | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/apex/apex.go b/apex/apex.go
index b02711eea..fdc105e37 100644
--- a/apex/apex.go
+++ b/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",