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

Commit 5630521a authored by Andrew Hsieh's avatar Andrew Hsieh
Browse files

resolved conflicts for merge of 3e91f5ad to jb-mr1-dev 

Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db
parents 063d0c5d 3e91f5ad

core/combo/TARGET_linux-x86.mk

+2 −1
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ TARGET_GLOBAL_CFLAGS += \ 
			-fno-short-enums \

			-fstrict-aliasing \

			-funswitch-loops \

			-funwind-tables

			-funwind-tables \

			-fstack-protector



android_config_h := $(call select-android-config-h,target_linux-x86)

TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))