Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 039cd7e0 authored by Tim Murray's avatar Tim Murray Committed by Gerrit Code Review
Browse files

Merge "Add LOCAL_NO_FPIE."

parents 7754e0ce 595d0dbd

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ LOCAL_MODULE_TARGET_ARCH_WARN:= 
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH:=

LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN:=

LOCAL_MODULE_HOST_ARCH:=

LOCAL_NO_FPIE :=



# arch specific variables

LOCAL_SRC_FILES_$(TARGET_ARCH):=

core/definitions.mk

+0 −1
Original line number Diff line number Diff line
@@ -1441,7 +1441,6 @@ $(hide) $(PRIVATE_CXX) \ 
	$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LD_DIRS) \

	$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

		$(PRIVATE_HOST_GLOBAL_LDFLAGS) \

		$(HOST_FPIE_FLAGS) \

	) \

	$(PRIVATE_LDFLAGS) \

	-o $@ \

core/host_executable.mk

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ endif 
endif

endif



ifeq ($(LOCAL_NO_FPIE),)

LOCAL_LDFLAGS += $(HOST_FPIE_FLAGS)

endif



ifeq ($(my_module_multilib),both)

ifeq ($(LOCAL_MODULE_PATH_32)$(LOCAL_MODULE_STEM_32),)

$(error $(LOCAL_PATH): LOCAL_MODULE_STEM_32 or LOCAL_MODULE_PATH_32 is required for LOCAL_MULTILIB := both for module $(LOCAL_MODULE))