Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update sources

Browse source
This commit is contained in:
Victor Shcherb 2012-01-14 23:00:22 +01:00
parent 86246dcfda
commit 785531bf79
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/build.xml
View file

@ -234,8 +234,9 @@
</then> </then>
<else> <else>
<fail message="ndk.dir is missing. Make sure to generate local.properties or to inject it through an env var" unless="ndk.dir"/> <fail message="ndk.dir is missing. Make sure to generate local.properties or to inject it through an env var" unless="ndk.dir"/>
<!-- Requires 1) gcc, 2) make, 3) download android sources (skia) - specify branch 4) Define environment variable ANDROID_SRC -->
<echo>Package helper running: nativeon</echo> <echo>Package helper running: nativeon</echo>
<exec command="${ndk.dir}/ndk-build V=1" failonerror="true"/> <exec command="${ndk.dir}/ndk-build V=1" failonerror="true"/>
<apkbuilder <apkbuilder
outfolder="${out.absolute.dir}" outfolder="${out.absolute.dir}"

11
OsmAnd/jni/osmand/Android.mk
View file

@ -1,5 +1,4 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
#include $(CLEAR_VARS) #include $(CLEAR_VARS)
#LOCAL_MODULE := skia2.2 #LOCAL_MODULE := skia2.2
@ -34,12 +33,14 @@ include $(CLEAR_VARS)
#include $(PREBUILT_STATIC_LIBRARY) #include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ifeq ($(ANDROID_SRC),)
ANDROID_SRC := /home/victor/projects/android/
endif
ANDROID_FOLDER := /home/victor/projects/android/
#PROTOBUF_FOLDER := /home/victor/projects/OsmAnd/libs/protobuf-2.3.0/src #PROTOBUF_FOLDER := /home/victor/projects/OsmAnd/libs/protobuf-2.3.0/src
PROTOBUF_FOLDER := $(LOCAL_PATH)/../protobuf PROTOBUF_FOLDER := $(LOCAL_PATH)/../protobuf
SKIA_FOLDER := $(ANDROID_FOLDER)/external/skia SKIA_FOLDER := $(ANDROID_SRC)/external/skia
SKIA_SRC := skia SKIA_SRC := skia
LOCAL_MODULE := osmand LOCAL_MODULE := osmand
@ -52,8 +53,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(SKIA_FOLDER)/include/effects \ $(SKIA_FOLDER)/include/effects \
$(SKIA_FOLDER)/include/utils/android \ $(SKIA_FOLDER)/include/utils/android \
$(SKIA_FOLDER)/src/core \ $(SKIA_FOLDER)/src/core \
$(ANDROID_FOLDER)/system/core/include \ $(ANDROID_SRC)/system/core/include \
$(ANDROID_FOLDER)/frameworks/base/include $(ANDROID_SRC)/frameworks/base/include
LOCAL_CPP_EXTENSION := .cpp LOCAL_CPP_EXTENSION := .cpp
LOCAL_SRC_FILES := common.cpp mapObjects.cpp \ LOCAL_SRC_FILES := common.cpp mapObjects.cpp \