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

Commit af3d1408 authored by Ben Cheng's avatar Ben Cheng Committed by Android Git Automerger
Browse files

am 2609640e: Merge "Add an explicit definition of __ANDROID__=1" 

* commit '2609640e':
  Add an explicit definition of __ANDROID__=1
parents 4d744829 2609640e

core/combo/TARGET_linux-aarch64.mk

+3 −6
Original line number Diff line number Diff line
@@ -75,12 +75,6 @@ TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined 


android_config_h := $(call select-android-config-h,linux-aarch64)



TARGET_GLOBAL_CFLAGS += \

			-fpic -fPIE \

			$(arch_variant_cflags) \

			-include $(android_config_h) \

			-I $(dir $(android_config_h))



TARGET_GLOBAL_CFLAGS += \

			-fpic -fPIE \

			-ffunction-sections \
@@ -94,6 +88,9 @@ TARGET_GLOBAL_CFLAGS += \ 
			-include $(android_config_h) \

			-I $(dir $(android_config_h))



# TODO - remove __ANDROID__ after the next aarch64 toolchain refresh

TARGET_GLOBAL_CFLAGS += -D__ANDROID__=1



TARGET_GLOBAL_CFLAGS += -fno-strict-volatile-bitfields



# This is to avoid the dreaded warning compiler message: