From 0a17b6a0e705e45cf47407d0573ef8a7fd67cd99 Mon Sep 17 00:00:00 2001
From: David Srbecky <dsrbecky@google.com>
Date: Wed, 1 Jul 2020 11:29:47 +0000
Subject: Revert "Support running of host gtests in eng-prod"

This reverts commit 22872da653053bb4b86fbef67163a9f6b7aee25b.

Reason for revert: Checking if this CL is cause of b/160132136

Bug: 147817558
Bug: 160132136
Change-Id: Ifb6f2292292a7f69fbd0f2e9204fd37dbca84277
---
 build/art.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'build/art.go')

diff --git a/build/art.go b/build/art.go
index af2a5deb54..8deea23098 100644
--- a/build/art.go
+++ b/build/art.go
@@ -291,11 +291,10 @@ func addTestcasesFile(ctx android.InstallHookContext) {
 	defer artTestMutex.Unlock()
 
 	if ctx.Os().Class == android.Host {
-		src := ctx.SrcPath().String()
-		path := strings.Split(ctx.Path().ToMakePath().String(), "/")
-		// Keep last two parts of the install path (e.g. bin/dex2oat).
-		dst := strings.Join(path[len(path)-2:], "/")
-		testcasesContent[dst] = src
+		path := ctx.Path().ToMakePath().String()
+		parts := strings.Split(path, "/")
+		// Keep last two parts of the path (e.g. bin/dex2oat).
+		testcasesContent[strings.Join(parts[len(parts)-2:], "/")] = path
 	}
 }
 
-- 
cgit v1.2.3-59-g8ed1b