diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libcpufeatures_proxy.so b/OsmAnd/jni-prebuilt/armeabi-v7a/libcpufeatures_proxy.so new file mode 100755 index 0000000000..c4ff39ab19 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libcpufeatures_proxy.so differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libexpat_static.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libexpat_static.a new file mode 100755 index 0000000000..0523fafcfe Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libexpat_static.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libexpat_static_neon.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libexpat_static_neon.a new file mode 100755 index 0000000000..0b8416a511 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libexpat_static_neon.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libft2_static.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libft2_static.a new file mode 100755 index 0000000000..82b6f184e3 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libft2_static.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libft2_static_neon.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libft2_static_neon.a new file mode 100755 index 0000000000..d0712f1135 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libft2_static_neon.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libgif.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libgif.a new file mode 100755 index 0000000000..51ca34681f Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libgif.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libgif_neon.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libgif_neon.a new file mode 100755 index 0000000000..bff51abb2f Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libgif_neon.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libjpeg.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libjpeg.a new file mode 100755 index 0000000000..4826ebc216 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libjpeg.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libjpeg_neon.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libjpeg_neon.a new file mode 100755 index 0000000000..65f2205911 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libjpeg_neon.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libpng.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libpng.a new file mode 100755 index 0000000000..6f3347f783 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libpng.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libpng_neon.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libpng_neon.a new file mode 100755 index 0000000000..f6895d7450 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libpng_neon.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libproto.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libproto.a new file mode 100755 index 0000000000..8a32ce6da6 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libproto.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libproto_neon.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libproto_neon.a new file mode 100755 index 0000000000..a79f29478f Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libproto_neon.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libskia.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libskia.a new file mode 100755 index 0000000000..b2769291e7 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libskia.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi-v7a/libskia_neon.a b/OsmAnd/jni-prebuilt/armeabi-v7a/libskia_neon.a new file mode 100755 index 0000000000..572239cd29 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi-v7a/libskia_neon.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi/libcpufeatures_proxy.so b/OsmAnd/jni-prebuilt/armeabi/libcpufeatures_proxy.so new file mode 100755 index 0000000000..265211830e Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi/libcpufeatures_proxy.so differ diff --git a/OsmAnd/jni-prebuilt/armeabi/libexpat_static.a b/OsmAnd/jni-prebuilt/armeabi/libexpat_static.a new file mode 100755 index 0000000000..15cd2e5bd6 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi/libexpat_static.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi/libft2_static.a b/OsmAnd/jni-prebuilt/armeabi/libft2_static.a new file mode 100755 index 0000000000..ac1a88bbad Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi/libft2_static.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi/libgif.a b/OsmAnd/jni-prebuilt/armeabi/libgif.a new file mode 100755 index 0000000000..731ac0fd93 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi/libgif.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi/libjpeg.a b/OsmAnd/jni-prebuilt/armeabi/libjpeg.a new file mode 100755 index 0000000000..a79faa4f90 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi/libjpeg.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi/libpng.a b/OsmAnd/jni-prebuilt/armeabi/libpng.a new file mode 100755 index 0000000000..519ad546cf Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi/libpng.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi/libproto.a b/OsmAnd/jni-prebuilt/armeabi/libproto.a new file mode 100755 index 0000000000..c73c0f0105 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi/libproto.a differ diff --git a/OsmAnd/jni-prebuilt/armeabi/libskia.a b/OsmAnd/jni-prebuilt/armeabi/libskia.a new file mode 100755 index 0000000000..a297b89a57 Binary files /dev/null and b/OsmAnd/jni-prebuilt/armeabi/libskia.a differ diff --git a/OsmAnd/jni-prebuilt/x86/libcpufeatures_proxy.so b/OsmAnd/jni-prebuilt/x86/libcpufeatures_proxy.so new file mode 100755 index 0000000000..f7e7075e0a Binary files /dev/null and b/OsmAnd/jni-prebuilt/x86/libcpufeatures_proxy.so differ diff --git a/OsmAnd/jni-prebuilt/x86/libexpat_static.a b/OsmAnd/jni-prebuilt/x86/libexpat_static.a new file mode 100755 index 0000000000..1e79b9238e Binary files /dev/null and b/OsmAnd/jni-prebuilt/x86/libexpat_static.a differ diff --git a/OsmAnd/jni-prebuilt/x86/libft2_static.a b/OsmAnd/jni-prebuilt/x86/libft2_static.a new file mode 100755 index 0000000000..63c3db7663 Binary files /dev/null and b/OsmAnd/jni-prebuilt/x86/libft2_static.a differ diff --git a/OsmAnd/jni-prebuilt/x86/libgif.a b/OsmAnd/jni-prebuilt/x86/libgif.a new file mode 100755 index 0000000000..4430694550 Binary files /dev/null and b/OsmAnd/jni-prebuilt/x86/libgif.a differ diff --git a/OsmAnd/jni-prebuilt/x86/libjpeg.a b/OsmAnd/jni-prebuilt/x86/libjpeg.a new file mode 100755 index 0000000000..286e171a44 Binary files /dev/null and b/OsmAnd/jni-prebuilt/x86/libjpeg.a differ diff --git a/OsmAnd/jni-prebuilt/x86/libpng.a b/OsmAnd/jni-prebuilt/x86/libpng.a new file mode 100755 index 0000000000..d44bdb024b Binary files /dev/null and b/OsmAnd/jni-prebuilt/x86/libpng.a differ diff --git a/OsmAnd/jni-prebuilt/x86/libproto.a b/OsmAnd/jni-prebuilt/x86/libproto.a new file mode 100755 index 0000000000..74b567f4c5 Binary files /dev/null and b/OsmAnd/jni-prebuilt/x86/libproto.a differ diff --git a/OsmAnd/jni-prebuilt/x86/libskia.a b/OsmAnd/jni-prebuilt/x86/libskia.a new file mode 100755 index 0000000000..1166d7a178 Binary files /dev/null and b/OsmAnd/jni-prebuilt/x86/libskia.a differ diff --git a/OsmAnd/jni/cpufeatures_proxy/Android.mk b/OsmAnd/jni/cpufeatures_proxy/Android.mk index 4960b3ac22..ecf9552b43 100755 --- a/OsmAnd/jni/cpufeatures_proxy/Android.mk +++ b/OsmAnd/jni/cpufeatures_proxy/Android.mk @@ -8,12 +8,17 @@ include $(CLEAR_VARS) # Name of the local module LOCAL_MODULE := cpufeatures_proxy +ifneq ($(OSMAND_USE_PREBUILT),true) LOCAL_SRC_FILES := \ cpuCheck.cpp - LOCAL_STATIC_LIBRARIES := cpufeatures - include $(BUILD_SHARED_LIBRARY) +else +LOCAL_SRC_FILES := \ + ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so +LOCAL_STATIC_LIBRARIES := cpufeatures +include $(PREBUILT_SHARED_LIBRARY) +endif $(call import-module,android/cpufeatures) diff --git a/OsmAnd/jni/expat/Android.mk b/OsmAnd/jni/expat/Android.mk index 703013078e..dfe6be4ea0 100755 --- a/OsmAnd/jni/expat/Android.mk +++ b/OsmAnd/jni/expat/Android.mk @@ -3,9 +3,9 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) -LOCAL_MODULE := libexpat_static +LOCAL_MODULE := expat_static else -LOCAL_MODULE := libexpat_static_neon +LOCAL_MODULE := expat_static_neon LOCAL_ARM_NEON := true endif @@ -16,6 +16,8 @@ ifeq ($(OSMAND_EXPAT_ABS),) OSMAND_EXPAT_ABS := $(LOCAL_PATH)/expat_library endif +ifneq ($(OSMAND_USE_PREBUILT),true) + LOCAL_SRC_FILES := \ $(OSMAND_EXPAT_LOC)/lib/xmlparse.c \ $(OSMAND_EXPAT_LOC)/lib/xmlrole.c \ @@ -28,3 +30,9 @@ LOCAL_C_INCLUDES += \ $(OSMAND_EXPAT_ABS)/lib include $(BUILD_STATIC_LIBRARY) + +else +LOCAL_SRC_FILES := \ + ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a +include $(PREBUILT_STATIC_LIBRARY) +endif diff --git a/OsmAnd/jni/freetype/Android.mk b/OsmAnd/jni/freetype/Android.mk index 318e023cbf..10cd1b7432 100755 --- a/OsmAnd/jni/freetype/Android.mk +++ b/OsmAnd/jni/freetype/Android.mk @@ -13,6 +13,15 @@ ifeq ($(OSMAND_FREETYPE_ABS),) OSMAND_FREETYPE_ABS := $(LOCAL_PATH)/freetype_library endif +ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) +LOCAL_MODULE := ft2_static +else +LOCAL_MODULE := ft2_static_neon +LOCAL_ARM_NEON := true +endif + +ifneq ($(OSMAND_USE_PREBUILT),true) + LOCAL_SRC_FILES:= \ $(OSMAND_FREETYPE_LOC)/src/base/ftbbox.c \ $(OSMAND_FREETYPE_LOC)/src/base/ftbitmap.c \ @@ -50,11 +59,10 @@ LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY" LOCAL_CFLAGS += -O2 -ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) -LOCAL_MODULE := libft2_static -else -LOCAL_MODULE := libft2_static_neon -LOCAL_ARM_NEON := true -endif - include $(BUILD_STATIC_LIBRARY) + +else +LOCAL_SRC_FILES := \ + ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a +include $(PREBUILT_STATIC_LIBRARY) +endif \ No newline at end of file diff --git a/OsmAnd/jni/gif/Android.mk b/OsmAnd/jni/gif/Android.mk index 8391e236c5..d1d224dfd1 100755 --- a/OsmAnd/jni/gif/Android.mk +++ b/OsmAnd/jni/gif/Android.mk @@ -8,6 +8,14 @@ ifeq ($(OSMAND_GIF_ABS),) OSMAND_GIF_ABS := $(LOCAL_PATH)/gif_library endif +ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) +LOCAL_MODULE := gif +else +LOCAL_MODULE := gif_neon +endif + +ifneq ($(OSMAND_USE_PREBUILT),true) + LOCAL_SRC_FILES := \ $(OSMAND_GIF_LOC)/dgif_lib.c \ $(OSMAND_GIF_LOC)/gifalloc.c \ @@ -18,10 +26,10 @@ LOCAL_C_INCLUDES += \ LOCAL_CFLAGS += -Wno-format -DHAVE_CONFIG_H -ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) -LOCAL_MODULE := libgif -else -LOCAL_MODULE := libgif_neon -endif - include $(BUILD_STATIC_LIBRARY) + +else +LOCAL_SRC_FILES := \ + ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a +include $(PREBUILT_STATIC_LIBRARY) +endif \ No newline at end of file diff --git a/OsmAnd/jni/jpeg/Android.mk b/OsmAnd/jni/jpeg/Android.mk index 945b574665..0ea59ca05b 100755 --- a/OsmAnd/jni/jpeg/Android.mk +++ b/OsmAnd/jni/jpeg/Android.mk @@ -10,6 +10,14 @@ ifeq ($(OSMAND_JPEG_ABS),) OSMAND_JPEG_ABS := $(LOCAL_PATH)/jpeg_library endif +ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) +LOCAL_MODULE := jpeg +else +LOCAL_MODULE := jpeg_neon +endif + +ifneq ($(OSMAND_USE_PREBUILT),true) + LOCAL_SRC_FILES := \ $(OSMAND_JPEG_LOC)/jcapimin.c \ $(OSMAND_JPEG_LOC)/jcapistd.c \ @@ -74,10 +82,10 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) LOCAL_CFLAGS += -DANDROID_ARMV6_IDCT endif -ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) -LOCAL_MODULE := libjpeg -else -LOCAL_MODULE := libjpeg_neon -endif +include $(BUILD_STATIC_LIBRARY) -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file +else +LOCAL_SRC_FILES := \ + ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a +include $(PREBUILT_STATIC_LIBRARY) +endif \ No newline at end of file diff --git a/OsmAnd/jni/png/Android.mk b/OsmAnd/jni/png/Android.mk index fb679ae45e..bfbd30057b 100755 --- a/OsmAnd/jni/png/Android.mk +++ b/OsmAnd/jni/png/Android.mk @@ -8,6 +8,17 @@ ifeq ($(OSMAND_PNG_ABS),) OSMAND_PNG_ABS := $(LOCAL_PATH)/png_library endif +LOCAL_SHARED_LIBRARIES := \ + libz + +ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) +LOCAL_MODULE := png +else +LOCAL_MODULE := png_neon +endif + +ifneq ($(OSMAND_USE_PREBUILT),true) + common_SRC_FILES := \ $(OSMAND_PNG_LOC)/png.c \ $(OSMAND_PNG_LOC)/pngerror.c \ @@ -47,15 +58,11 @@ LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_C_INCLUDES += $(common_C_INCLUDES) \ external/zlib -LOCAL_SHARED_LIBRARIES := \ - libz - -ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) -LOCAL_MODULE := libpng -else -LOCAL_MODULE := libpng_neon -endif include $(BUILD_STATIC_LIBRARY) - +else +LOCAL_SRC_FILES := \ + ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a +include $(PREBUILT_STATIC_LIBRARY) +endif \ No newline at end of file diff --git a/OsmAnd/jni/protobuf/Android.mk b/OsmAnd/jni/protobuf/Android.mk index 560cd53361..c18c97cc80 100644 --- a/OsmAnd/jni/protobuf/Android.mk +++ b/OsmAnd/jni/protobuf/Android.mk @@ -1,5 +1,16 @@ LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) +LOCAL_MODULE := proto +else +LOCAL_MODULE := proto_neon +LOCAL_ARM_NEON := true +endif + +ifneq ($(OSMAND_USE_PREBUILT),true) + CC_LITE_SRC_FILES := \ google/protobuf/stubs/common.cc \ google/protobuf/stubs/once.cc \ @@ -13,14 +24,6 @@ CC_LITE_SRC_FILES := \ google/protobuf/io/zero_copy_stream.cc \ google/protobuf/io/zero_copy_stream_impl_lite.cc -include $(CLEAR_VARS) - -ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) -LOCAL_MODULE := proto -else -LOCAL_MODULE := proto_neon -LOCAL_ARM_NEON := true -endif LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := .cc @@ -33,4 +36,10 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI LOCAL_LDLIBS := -llog -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file +include $(BUILD_STATIC_LIBRARY) + +else +LOCAL_SRC_FILES := \ + ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a +include $(PREBUILT_STATIC_LIBRARY) +endif \ No newline at end of file diff --git a/OsmAnd/jni/skia/Android.mk b/OsmAnd/jni/skia/Android.mk index 5e333e15a4..699ce56eec 100755 --- a/OsmAnd/jni/skia/Android.mk +++ b/OsmAnd/jni/skia/Android.mk @@ -34,6 +34,8 @@ ifeq ($(OSMAND_JPEG_ABS),) OSMAND_JPEG_ABS := $(LOCAL_PATH)/../jpeg/jpeg_library endif +ifneq ($(OSMAND_USE_PREBUILT),true) + LOCAL_ARM_MODE := arm # need a flag to tell the C side when we're on devices with large memory @@ -321,6 +323,12 @@ LOCAL_LDLIBS += -lz -llog include $(BUILD_STATIC_LIBRARY) +else +LOCAL_SRC_FILES := \ + ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a +include $(PREBUILT_STATIC_LIBRARY) +endif + # Fix some errors BUILD_HOST_EXECUTABLE := $(LOCAL_PATH)/FakeHost.mk BUILD_HOST_STATIC_LIBRARY := $(LOCAL_PATH)/FakeHost.mk \ No newline at end of file