diff --git a/Osmand-kernel/Makefile.rules b/Osmand-kernel/Makefile.rules index ac2ee34d58..fca00b64d7 100755 --- a/Osmand-kernel/Makefile.rules +++ b/Osmand-kernel/Makefile.rules @@ -32,8 +32,8 @@ OBJECTS = $(addprefix obj-$(TARGET)-$(ARCH)/,$(OBJECTS_NAMES)) .PRECIOUS: build-release/$(LIBNAME).$(LIBTYPE) build-debug/$(LIBNAME).$(LIBTYPE) $(addprefix build-release/,$(OBJECTS)) $(addprefix build-debug/,$(OBJECTS)) # Route build targets properly -installr: release $(OUTPUT_DIR_PREFIX)-release/$(LIBNAME).$(LIBTYPE) -installd: debug $(OUTPUT_DIR_PREFIX)-debug/$(LIBNAME).$(LIBTYPE) +installr: $(OUTPUT_DIR_PREFIX)-release/$(LIBNAME).$(LIBTYPE) +installd: $(OUTPUT_DIR_PREFIX)-debug/$(LIBNAME).$(LIBTYPE) release: $(BUILD_DIR_PREFIX)-release/$(LIBNAME).$(LIBTYPE) debug: $(BUILD_DIR_PREFIX)-debug/$(LIBNAME).$(LIBTYPE) @@ -53,7 +53,8 @@ $(OUTPUT_DIR_PREFIX)-%/$(LIBNAME).$(DYNAMICLIB_EXT): $(BUILD_DIR_PREFIX)-%/$(LIB @mkdir -p $(OUTPUT_DIR_PREFIX)-$* cp $(BUILD_DIR_PREFIX)-$*/$(LIBNAME).$(LIBTYPE) $(OUTPUT_DIR_PREFIX)-$*/$(LIBNAME).$(LIBTYPE) -$(OUTPUT_DIR_PREFIX)-%/$(LIBNAME).$(STATICLIB_EXT): +$(OUTPUT_DIR_PREFIX)-%/$(LIBNAME).$(STATICLIB_EXT): $(BUILD_DIR_PREFIX)-%/$(LIBNAME).$(LIBTYPE) + @echo $@ does not need install # Builds source files using CC compiler build-release/obj-$(TARGET)-$(ARCH)/%.cc.o : % $(LOCAL_C_INCLUDES) diff --git a/Osmand-kernel/expat/Android.mk b/Osmand-kernel/expat/Android.mk index f272b24648..5b62cf3909 100755 --- a/Osmand-kernel/expat/Android.mk +++ b/Osmand-kernel/expat/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) include $(LOCAL_PATH)/Common.mk +LOCAL_CFLAGS += -fPIC ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) LOCAL_MODULE := expat_static diff --git a/Osmand-kernel/freetype/Android.mk b/Osmand-kernel/freetype/Android.mk index 94d2c4441f..7d8634f4dc 100755 --- a/Osmand-kernel/freetype/Android.mk +++ b/Osmand-kernel/freetype/Android.mk @@ -1,6 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) include $(LOCAL_PATH)/Common.mk +LOCAL_CFLAGS += -fPIC # compile in ARM mode, since the glyph loader/renderer is a hotspot # when loading complex pages in the browser diff --git a/Osmand-kernel/freetype/Common.mk b/Osmand-kernel/freetype/Common.mk index 294189be36..ed3c31bad7 100644 --- a/Osmand-kernel/freetype/Common.mk +++ b/Osmand-kernel/freetype/Common.mk @@ -29,7 +29,6 @@ LOCAL_C_INCLUDES += \ $(OSMAND_FREETYPE_ABS)/include LOCAL_CFLAGS += -W -Wall -LOCAL_CFLAGS += -fPIC -DPIC LOCAL_CFLAGS += "-DDARWIN_NO_CARBON" LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY" diff --git a/Osmand-kernel/osmand/Android.mk b/Osmand-kernel/osmand/Android.mk index 336d8a2e81..053570c448 100644 --- a/Osmand-kernel/osmand/Android.mk +++ b/Osmand-kernel/osmand/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include $(LOCAL_PATH)/Common.mk +LOCAL_CFLAGS += -fPIC # Name of the local module ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)