RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[new downloader] Fixed android tests

Browse source
This commit is contained in:
Constantin Shalnev 2016-02-12 17:03:10 +03:00 • committed by Sergey Yershov
parent b9cbed92a8
commit 05996dcc03
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/UnitTests/jni/AndroidBeginning.mk
View file

@ -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

8
indexer/indexer_tests/jni/Android.mk
View file

@ -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