From 069818d1a8379c3570919668e639d75cea2c1a9f Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Fri, 13 Jul 2018 14:45:37 +0100 Subject: COMPMID-1246: Fixed nightly build: static libraries were linked in the wrong order on Android Change-Id: I5346909c85180eeacd05cd94ee26cb974100c2b9 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/139904 Tested-by: Jenkins Reviewed-by: Georgios Pinitas --- tests/SConscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/SConscript') diff --git a/tests/SConscript b/tests/SConscript index c0ada540bb..669e811a13 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -135,11 +135,11 @@ if test_env['benchmark_tests']: Export('arm_compute_benchmark') if test_env['validation_tests']: - arm_compute_validation_framework = env.StaticLibrary('arm_compute_validation_framework', Glob('validation/reference/*.cpp') + Glob('validation/*.cpp'), LIBS= [ arm_compute_test_framework]) + arm_compute_validation_framework = env.StaticLibrary('arm_compute_validation_framework', Glob('validation/reference/*.cpp') + Glob('validation/*.cpp'), LIBS= [ arm_compute_test_framework, arm_compute_core_a]) Depends(arm_compute_validation_framework , arm_compute_test_framework) Depends(arm_compute_validation_framework , arm_compute_core_a) - arm_compute_validation = test_env.Program('arm_compute_validation', files_validation + common_objects, LIBS=test_env['LIBS']+[arm_compute_validation_framework]) + arm_compute_validation = test_env.Program('arm_compute_validation', files_validation + common_objects, LIBS=[arm_compute_validation_framework] + test_env['LIBS']) Depends(arm_compute_validation, arm_compute_validation_framework) Depends(arm_compute_validation, arm_compute_test_framework) Depends(arm_compute_validation, arm_compute_lib) -- cgit v1.2.1