From 57380a902ea85814f5e42622786a992a5c12f9c0 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 10 Mar 2020 13:46:36 +0000 Subject: [PATCH] Remove special handling of test_ apexes Test apexes no longer check to see whether their contents are available so the special handling is no longer necessary. Bug: 142935992 Test: m nothing Change-Id: Iecae7dcbb87908d19c672f74d3c1ed8810d4485b --- apex/apex.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/apex/apex.go b/apex/apex.go index 2f8384fbe..5ac18ef9b 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2394,8 +2394,6 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 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_")