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

Updated Makefiles to allow selective building. For Jenkins OSMAND_ARM_ONLY envvar should be set

Browse source
This commit is contained in:
Alexey Pelykh 2012-03-14 14:48:59 +02:00
parent 23a1fa4c59
commit dd51beff1f
11 changed files with 43 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OsmAnd/jni/Android.mk
View file

@ -1,13 +1,29 @@
OSMAND_MAKEFILES := $(all-subdir-makefiles)
# Protect from previous builds
ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
OSMAND_BUILDING_NEON_LIBRARY := false
endif
# OSMAND_FORCE_NEON_SUPPORT is used to force only NEON support on ARMv7a
ifdef OSMAND_FORCE_NEON_SUPPORT
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
OSMAND_BUILDING_NEON_LIBRARY := true
endif
endif
# By default, include makefiles only once
include $(OSMAND_MAKEFILES)
# If we may support NEON, include them once more
# If we're not asked not to support NEON and not asked to support only NEON ARMv7a, then
# make additional build
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifndef OSMAND_SKIP_NEON_SUPPORT
ifndef OSMAND_FORCE_NEON_SUPPORT
OSMAND_NEON := true
OSMAND_BUILDING_NEON_LIBRARY := true
include $(OSMAND_MAKEFILES)
endif
endif
endif

16
OsmAnd/jni/Application.mk
View file

@ -1,7 +1,21 @@
APP_STL := stlport_shared
APP_ABI := armeabi armeabi-v7a
APP_ABI := all
APP_CPPFLAGS := -fno-rtti -fno-exceptions
ifdef OSMAND_X86_ONLY
APP_ABI := x86
else
ifdef OSMAND_ARM_ONLY
APP_ABI := armeabi armeabi-v7a
endif
ifdef OSMAND_ARMv5_ONLY
APP_ABI := armeabi
endif
ifdef OSMAND_ARMv7a_ONLY
APP_ABI := armeabi-v7a
endif
endif
ifndef OSMAND_DEBUG_NATIVE
# Force release compilation in release optimizations, even if application is debuggable by manifest
APP_OPTIM := release

2
OsmAnd/jni/cpufeatures_proxy/Android.mk
View file

@ -1,5 +1,5 @@
# Do not build for NEON
ifneq ($(OSMAND_NEON),true)
ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
LOCAL_PATH := $(call my-dir)

2
OsmAnd/jni/expat/Android.mk
View file

@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
ifneq ($(OSMAND_NEON),true)
ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
LOCAL_MODULE := libexpat_static
else
LOCAL_MODULE := libexpat_static_neon

2
OsmAnd/jni/freetype/Android.mk
View file

@ -50,7 +50,7 @@ LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY"
LOCAL_CFLAGS += -O2
ifneq ($(OSMAND_NEON),true)
ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
LOCAL_MODULE := libft2_static
else
LOCAL_MODULE := libft2_static_neon

2
OsmAnd/jni/gif/Android.mk
View file

@ -18,7 +18,7 @@ LOCAL_C_INCLUDES += \
LOCAL_CFLAGS += -Wno-format -DHAVE_CONFIG_H
ifneq ($(OSMAND_NEON),true)
ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
LOCAL_MODULE := libgif
else
LOCAL_MODULE := libgif_neon

2
OsmAnd/jni/jpeg/Android.mk
View file

@ -74,7 +74,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_CFLAGS += -DANDROID_ARMV6_IDCT
endif
ifneq ($(OSMAND_NEON),true)
ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
LOCAL_MODULE := libjpeg
else
LOCAL_MODULE := libjpeg_neon

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

@ -13,7 +13,7 @@ ifeq ($(OSMAND_SKIA_ABS),)
endif
# Name of the local module
ifneq ($(OSMAND_NEON),true)
ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
LOCAL_MODULE := osmand
else
LOCAL_MODULE := osmand_neon

2
OsmAnd/jni/png/Android.mk
View file

@ -50,7 +50,7 @@ LOCAL_C_INCLUDES += $(common_C_INCLUDES) \
LOCAL_SHARED_LIBRARIES := \
libz
ifneq ($(OSMAND_NEON),true)
ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
LOCAL_MODULE := libpng
else
LOCAL_MODULE := libpng_neon

2
OsmAnd/jni/protobuf/Android.mk
View file

@ -15,7 +15,7 @@ CC_LITE_SRC_FILES := \
include $(CLEAR_VARS)
ifneq ($(OSMAND_NEON),true)
ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
LOCAL_MODULE := proto
else
LOCAL_MODULE := proto_neon

2
OsmAnd/jni/skia/Android.mk
View file

@ -4,7 +4,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
ifneq ($(OSMAND_NEON),true)
ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
LOCAL_MODULE := skia
else
LOCAL_MODULE := skia_neon