Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57380a90 authored by Paul Duffin's avatar Paul Duffin
Browse files

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
parent 50cbefd5

apex/apex.go

+0 −2
Original line number Diff line number Diff line
@@ -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_")