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

Commit cdd14758 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"

parents 0a3cf1a0 8f47fc37

core/binary.mk

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ my_cxx := $(LOCAL_CXX) 
my_c_includes := $(LOCAL_C_INCLUDES) $(LOCAL_C_INCLUDES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))

my_generated_sources := $(LOCAL_GENERATED_SOURCES)



my_cflags := $(filter-out $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_UNSUPPORTED_CFLAGS),$(my_cflags))



# The real dependency will be added after all Android.mks are loaded and the install paths

# of the shared libraries are determined.

core/combo/TARGET_linux-arm64.mk

+3 −0
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ TARGET_GLOBAL_CFLAGS += \ 
			-include $(android_config_h) \

			-I $(dir $(android_config_h))



# HACK: globally disable -fstack-protector until the toolchain supports it

TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector



# TODO - remove __ANDROID__ after the next aarch64 toolchain refresh

TARGET_GLOBAL_CFLAGS += -D__ANDROID__=1