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

[yopme][yopme2] Compilation fixes

Browse source
This commit is contained in:
Alex Zolotarev 2014-07-21 22:55:21 +03:00 • committed by Alex Zolotarev
parent 38ef24796d
commit 3c7dfd7d2e
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/YoPme/AndroidManifest.xml
View file

@ -1,12 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mapswithme.yopme"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="17"
android:targetSdkVersion="19" />
package="com.mapswithme.yopme">
<uses-permission
android:name="com.yotadevices.framework.permission.ACCESS_BACKSCREEN" />

8
android/YoPme/gradle.properties
View file

@ -1,7 +1,7 @@
propMinSdkVersion=17
propTargetSdkVersion=19
propBuildToolsVersion=19.1
propVersionCode=8
propVersionName=1.1.1
propTargetSdkVersion=20
propBuildToolsVersion=20
propVersionCode=100
propVersionName=1.2
propApkName=YoPMe_mobile_maps
propNdkFlags=V=0 NDK_DEBUG=0 PRODUCTION=1

7
android/YoPme/jni/Android.mk
View file

@ -107,6 +107,11 @@ LOCAL_MODULE := storage
LOCAL_SRC_FILES := $(MY_PREBUILT_LIBS_PATH)/libstorage.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := routing
LOCAL_SRC_FILES := $(MY_PREBUILT_LIBS_PATH)/librouting.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := search
LOCAL_SRC_FILES := $(MY_PREBUILT_LIBS_PATH)/libsearch.a
@ -129,7 +134,7 @@ endif
include $(CLEAR_VARS)
LOCAL_MODULE := yopme
LOCAL_STATIC_LIBRARIES := map gui search storage indexer graphics platform anim geometry coding base expat freetype fribidi zlib bzip2 jansson tomcrypt protobuf
LOCAL_STATIC_LIBRARIES := map gui search routing storage indexer graphics platform anim geometry coding base expat freetype fribidi zlib bzip2 jansson tomcrypt protobuf
LOCAL_CFLAGS := -ffunction-sections -fdata-sections -Wno-psabi
TARGET_PLATFORM := android-15

4
android/YoPme/jni/Framework.cpp
View file

@ -126,8 +126,8 @@ namespace yopme
bool Framework::AreLocationsFarEnough(double lat1, double lon1, double lat2, double lon2) const
{
double const sqPixLength =
m_framework.GtoP(MercatorBounds::FromLatLon(lat1, lon1)))
.SquareLength(m_framework.GtoP(MercatorBounds::FromLatLon(lat2, lon2))));
m_framework.GtoP(MercatorBounds::FromLatLon(lat1, lon1))
.SquareLength(m_framework.GtoP(MercatorBounds::FromLatLon(lat2, lon2)));
// Pixel radius of location mark is 10 pixels.
return (sqPixLength > 100 && ms::DistanceOnEarth(lat1, lon1, lat2, lon2) > 5.0);