From 660a1a3a2d0d30a1bc618640a2245c429ba0a8d8 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 11 Aug 2013 13:28:11 +0300 Subject: [PATCH] Fix --- OsmAnd/jni/Android.mk | 4 ++-- OsmAnd/jni/cpufeatures_proxy/Android.mk | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index 9f10103740..9edadfa672 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -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 diff --git a/OsmAnd/jni/cpufeatures_proxy/Android.mk b/OsmAnd/jni/cpufeatures_proxy/Android.mk index cdc92f32c8..e26c2b7de2 100755 --- a/OsmAnd/jni/cpufeatures_proxy/Android.mk +++ b/OsmAnd/jni/cpufeatures_proxy/Android.mk @@ -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 \ No newline at end of file + +endif