From 9fb0cac961f70d1937c5fa3eafeaee1385c89768 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Fri, 20 Apr 2018 15:46:21 +0100 Subject: COMPMID-1081: Introduced test-wide instruments Change-Id: I5831241f3fc503717cc51136453c2bf96d4b420b Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/128484 Tested-by: Jenkins Reviewed-by: Georgios Pinitas --- examples/SConscript | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'examples/SConscript') diff --git a/examples/SConscript b/examples/SConscript index 7f7df3e9aa..230305b5ea 100644 --- a/examples/SConscript +++ b/examples/SConscript @@ -52,7 +52,7 @@ for file in Glob("./graph_*.cpp"): prog = None arm_compute_graph_libs = arm_compute_libs - if env['os'] == 'android': + if env['os'] in ['android', 'bare_metal'] or env['standalone']: prog = examples_env.Program(example, ["{}.cpp".format(example), utils, graph_utils], LIBS = arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive']) Depends(prog, graph_dependency) else: @@ -89,14 +89,7 @@ if env['neon']: if env['gles_compute']: for file in Glob("./gc_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) - if env['os'] != 'android': - prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_GC'], LIBS = arm_compute_libs) - Depends(prog, arm_compute_dependency) - else: - if env['arch'] != 'armv7a': - prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_GC'], LIBS = arm_compute_libs) - else: - prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_GC'], LIBS = arm_compute_libs) - Depends(prog, [arm_compute_dependency]) + prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_GC'], LIBS = arm_compute_libs) + Depends(prog, arm_compute_dependency) alias = examples_env.Alias(example, prog) Default(alias) -- cgit v1.2.1