From 624b8ed0b3c428ecc538641ec98e6989892ad742 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 11 Jul 2016 17:20:09 -0700
Subject: [PATCH] Fix install path of benchmarks

Benchmarks should go in /data/nativetest/<module> like tests.

Change-Id: Ib72ee699334da6a6d27813822e1f86f2863227b3
---
 cc/cc.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cc/cc.go b/cc/cc.go
index 64ac50f2e..f41984f2c 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -2254,10 +2254,12 @@ func NewBenchmark(hod android.HostOrDeviceSupported) *Module {
 	module := newModule(hod, android.MultilibFirst)
 	module.compiler = &baseCompiler{}
 	module.linker = &benchmarkLinker{}
-	module.installer = &baseInstaller{
-		dir:   "nativetest",
-		dir64: "nativetest64",
-		data:  true,
+	module.installer = &testInstaller{
+		baseInstaller: baseInstaller{
+			dir:   "nativetest",
+			dir64: "nativetest64",
+			data:  true,
+		},
 	}
 	return module
 }