commit f53737fadce6b2ffda3438593cf48bf7314cfb18
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 11 17:52:56 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 11 17:52:56 2020 +0000
tree 0361410057781949d59046277dc140a6ec72c535
parent 643953d17016ae6e62af7b43dba29fee33510fa2
parent 57380a902ea85814f5e42622786a992a5c12f9c0

Merge "Remove special handling of test_ apexes"

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index 954c352..a4467f6 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -2395,8 +2395,6 @@
 
 func whitelistedApexAvailable(apex, moduleName string) bool {
 	key := apex
-	key = strings.Replace(key, "test_", "", 1)
-
 	// Prebuilt modules (e.g. java_import, etc.) have "prebuilt_" prefix added by the build
 	// system. Trim the prefix for the check since they are confusing
 	moduleName = strings.TrimPrefix(moduleName, "prebuilt_")