From 28690e9c7434c3eff20b3444a277289aa94a33b7 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 8 Sep 2017 16:20:30 -0700 Subject: [PATCH] Move benchmarks to /data/benchmarktest[64] to match make Port Ife0f43062e36ffc856f41683ddc4d91a7787333e to soong. Test: m -j checkbuild Change-Id: I66a0a53061b547e30aedd16ee617723197069171 --- cc/test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cc/test.go b/cc/test.go index a52e94acb..1501a2636 100644 --- a/cc/test.go +++ b/cc/test.go @@ -337,8 +337,8 @@ func (benchmark *benchmarkDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps func (benchmark *benchmarkDecorator) install(ctx ModuleContext, file android.Path) { benchmark.data = ctx.ExpandSources(benchmark.Properties.Data, nil) - benchmark.binaryDecorator.baseInstaller.dir = filepath.Join("nativetest", ctx.ModuleName()) - benchmark.binaryDecorator.baseInstaller.dir64 = filepath.Join("nativetest64", ctx.ModuleName()) + benchmark.binaryDecorator.baseInstaller.dir = filepath.Join("benchmarktest", ctx.ModuleName()) + benchmark.binaryDecorator.baseInstaller.dir64 = filepath.Join("benchmarktest64", ctx.ModuleName()) benchmark.binaryDecorator.baseInstaller.install(ctx, file) } @@ -355,7 +355,7 @@ func NewBenchmark(hod android.HostOrDeviceSupported) *Module { module, binary := NewBinary(hod) module.multilib = android.MultilibBoth - binary.baseInstaller = NewTestInstaller() + binary.baseInstaller = NewBaseInstaller("benchmarktest", "benchmarktest64", InstallInData) benchmark := &benchmarkDecorator{ binaryDecorator: binary,