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

fix

Browse source
This commit is contained in:
Alexey Pelykh 2013-08-11 13:35:44 +03:00
parent e452ca6f8c
commit 3014ddb049
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/jni/Android.mk
View file

@ -2,20 +2,18 @@ LOCAL_PATH := $(call my-dir)
ROOT_PATH := $(LOCAL_PATH)/../../.. ROOT_PATH := $(LOCAL_PATH)/../../..
$(info OsmAnd root: $(ROOT_PATH)) $(info OsmAnd root: $(ROOT_PATH))
include $(CLEAR_VARS)
ifdef BUILD_ONLY_OLD_LIB ifdef BUILD_ONLY_OLD_LIB
OSMAND_MAKEFILES := $(call all-makefiles-under,$(LOCAL_PATH)/) \ OSMAND_MAKEFILES := \
$(all-subdir-makefiles) \
$(call all-makefiles-under,$(ROOT_PATH)/core/targets/android) $(call all-makefiles-under,$(ROOT_PATH)/core/targets/android)
$(info OsmAnd makefiles: $(OSMAND_MAKEFILES))
else else
OSMAND_MAKEFILES := \ OSMAND_MAKEFILES := \
$(call all-makefiles-under,$(ROOT_PATH)/core/externals) \ $(call all-makefiles-under,$(ROOT_PATH)/core/externals) \
$(ROOT_PATH)/core/Android.mk \ $(ROOT_PATH)/core/Android.mk \
$(LOCAL_PATH)/cpufeatures_proxy/Android.mk \ $(all-subdir-makefiles) \
$(ROOT_PATH)/android/OsmAnd-java/Android.mk $(ROOT_PATH)/android/OsmAnd-java/Android.mk
$(info OsmAnd makefiles: $(OSMAND_MAKEFILES))
endif endif
$(info OsmAnd makefiles: $(OSMAND_MAKEFILES))
# Protect from previous builds # Protect from previous builds
ifneq ($(TARGET_ARCH_ABI),armeabi-v7a) ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
@ -23,7 +21,7 @@ ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
endif endif
# OSMAND_FORCE_NEON_SUPPORT is used to force only NEON support on ARMv7a # OSMAND_FORCE_NEON_SUPPORT is used to force only NEON support on ARMv7a
ifdef OSMAND_FORCE_NEON_SUPPORT ifeq ($(OSMAND_FORCE_NEON_SUPPORT),true)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
OSMAND_BUILDING_NEON_LIBRARY := true OSMAND_BUILDING_NEON_LIBRARY := true
endif endif
@ -35,8 +33,8 @@ include $(OSMAND_MAKEFILES)
# If we're not asked not to support NEON and not asked to support only NEON ARMv7a, then # If we're not asked not to support NEON and not asked to support only NEON ARMv7a, then
# make additional build # make additional build
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifndef OSMAND_SKIP_NEON_SUPPORT ifneq ($(OSMAND_SKIP_NEON_SUPPORT),true)
ifndef OSMAND_FORCE_NEON_SUPPORT ifneq ($(OSMAND_FORCE_NEON_SUPPORT),true)
OSMAND_BUILDING_NEON_LIBRARY := true OSMAND_BUILDING_NEON_LIBRARY := true
include $(OSMAND_MAKEFILES) include $(OSMAND_MAKEFILES)