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

Commit f6771f63 authored by Ed Heyl's avatar Ed Heyl
Browse files

reconcile aosp (8689b90b) after branching. Please do not merge. 

Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161
parent 4f892ab7

core/combo/TARGET_linux-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ 
			-Werror=format-security \

			-D_FORTIFY_SOURCE=2 \

			-Wstrict-aliasing=2 \

			-fPIC -fPIE \

			-fPIC \

			-ffunction-sections \

			-finline-functions \

			-finline-limit=300 \

core/combo/TARGET_linux-x86_64.mk

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ TARGET_GLOBAL_CFLAGS += \ 
			-Werror=format-security \

			-D_FORTIFY_SOURCE=2 \

			-Wstrict-aliasing=2 \

			-fPIC -fPIE \

			-fPIC \

			-ffunction-sections \

			-finline-functions \

			-finline-limit=300 \