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:28:11 +03:00
parent 7cefd42bc8
commit 660a1a3a2d
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/jni/Android.mk
View file

@ -12,7 +12,7 @@ else
OSMAND_MAKEFILES := \
$(call all-makefiles-under,$(ROOT_PATH)/core/externals) \
$(ROOT_PATH)/core/Android.mk \
$(call all-makefiles-under,$(LOCAL_PATH)/) \
$(LOCAL_PATH)/cpufeatures_proxy/Android.mk \
$(ROOT_PATH)/android/OsmAnd-java/Android.mk
$(info OsmAnd makefiles: $(OSMAND_MAKEFILES))
endif
@ -35,7 +35,7 @@ include $(OSMAND_MAKEFILES)
# 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_SKIP_NEON_SUPPORT
ifndef OSMAND_FORCE_NEON_SUPPORT
OSMAND_BUILDING_NEON_LIBRARY := true

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

@ -1,22 +1,22 @@
# CPU Features library should not be built for newon
#ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
# CPU Features library should not be built for NEON
ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := cpufeatures_proxy
ifneq ($(OSMAND_USE_PREBUILT),true)
LOCAL_SRC_FILES := \
cpuCheck.cpp
LOCAL_STATIC_LIBRARIES := cpufeatures
include $(BUILD_SHARED_LIBRARY)
LOCAL_SRC_FILES := \
cpuCheck.cpp
LOCAL_STATIC_LIBRARIES := cpufeatures
include $(BUILD_SHARED_LIBRARY)
else
LOCAL_SRC_FILES := \
../lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so
LOCAL_STATIC_LIBRARIES := cpufeatures
include $(PREBUILT_SHARED_LIBRARY)
LOCAL_SRC_FILES := \
../lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so
LOCAL_STATIC_LIBRARIES := cpufeatures
include $(PREBUILT_SHARED_LIBRARY)
endif
$(call import-module,android/cpufeatures)
#endif
endif