From ab67d8f9b47c3342bfdae41f59ab1c8c7d39a70d Mon Sep 17 00:00:00 2001
From: Orion Hodson <oth@google.com>
Date: Thu, 11 Jun 2020 14:56:44 +0100
Subject: [PATCH] Remove libnativehelper modules from whitelist

Bug: 147364041
Test: m nothing
Change-Id: I6a43511fee3feeb164e07d5620eea0564fbee302
---
 apex/apex.go | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/apex/apex.go b/apex/apex.go
index 94eb2c41c..a4b2a3954 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -184,12 +184,6 @@ func makeApexAvailableWhitelist() map[string][]string {
 	//
 	// Module separator
 	//
-	m["com.android.conscrypt"] = []string{
-		"libnativehelper_header_only",
-	}
-	//
-	// Module separator
-	//
 	m["com.android.extservices"] = []string{
 		"error_prone_annotations",
 		"ExtServices-core",
@@ -499,7 +493,6 @@ func makeApexAvailableWhitelist() map[string][]string {
 		"libbase_ndk",
 		"libfuse",
 		"libfuse_jni",
-		"libnativehelper_header_only",
 	}
 	//
 	// Module separator
@@ -594,7 +587,6 @@ func makeApexAvailableWhitelist() map[string][]string {
 		"ipmemorystore-aidl-interfaces-java",
 		"libcgrouprc",
 		"libcgrouprc_format",
-		"libnativehelper_compat_libc++",
 		"libtetherutilsjni",
 		"libvndksupport",
 		"net-utils-framework-common",