From 05996dcc03672610eb158aef4cdff27b975b8cbc Mon Sep 17 00:00:00 2001 From: Constantin Shalnev Date: Fri, 12 Feb 2016 17:03:10 +0300 Subject: [PATCH] [new downloader] Fixed android tests --- android/UnitTests/jni/AndroidBeginning.mk | 4 ++-- indexer/indexer_tests/jni/Android.mk | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/UnitTests/jni/AndroidBeginning.mk b/android/UnitTests/jni/AndroidBeginning.mk index e0dca37833..51c9902b5c 100644 --- a/android/UnitTests/jni/AndroidBeginning.mk +++ b/android/UnitTests/jni/AndroidBeginning.mk @@ -23,7 +23,7 @@ define add_prebuild_static_lib include $(PREBUILT_STATIC_LIBRARY) endef -prebuild_static_libs := minizip osrm protobuf tomcrypt jansson fribidi freetype expat base coding geometry anim platform graphics indexer storage search routing gui map opening_hours stats_client succinct +prebuild_static_libs := minizip osrm protobuf tomcrypt jansson fribidi freetype expat base coding geometry platform indexer storage search routing map opening_hours stats_client succinct $(foreach item,$(prebuild_static_libs),$(eval $(call add_prebuild_static_lib,$(item)))) @@ -59,6 +59,6 @@ LOCAL_SRC_FILES += $(ROOT_PATH_FROM_JNI)/testing/testingmain.cpp LOCAL_SRC_FILES += $(ROOT_PATH_FROM_JNI)/android/UnitTests/jni/mock.cpp LOCAL_SRC_FILES += ./test.cpp -LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM +LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM LOCAL_LDLIBS += -lGLESv2 -latomic -lz LOCAL_LDLIBS += -Wl,--gc-sections diff --git a/indexer/indexer_tests/jni/Android.mk b/indexer/indexer_tests/jni/Android.mk index e3b7a7cfc0..68195b9af3 100644 --- a/indexer/indexer_tests/jni/Android.mk +++ b/indexer/indexer_tests/jni/Android.mk @@ -1,6 +1,6 @@ -# @todo(vbykoianko) -# Probably this file shell be generated with a script based on .pro. -# If you do this take into acount: +# @todo(vbykoianko) +# Probably this file shell be generated with a script based on .pro. +# If you do this take into acount: # - the order of libs is important. It solves some linking problems; # - there are additional libs here (android_native_app_glue and zlib); @@ -10,6 +10,6 @@ include ../../android/UnitTests/jni/AndroidBeginning.mk LOCAL_MODULE := indexer_tests -LOCAL_STATIC_LIBRARIES := android_native_app_glue indexer platform geometry coding base protobuf tomcrypt opening_hours minizip zlib +LOCAL_STATIC_LIBRARIES := succinct android_native_app_glue indexer platform geometry coding base protobuf tomcrypt opening_hours minizip zlib include ../../android/UnitTests/jni/AndroidEnding.mk