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

Commit 3101e61f authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolved conflicts for merge of e04e91b1 to master

Change-Id: I537065b0810ea8525401778824c4810c5e7ef433
parents 16109f6c e04e91b1
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -66,20 +66,22 @@ CLANG_CONFIG_UNKNOWN_CFLAGS := \
  -fno-tree-sra \
  -fprefetch-loop-arrays \
  -funswitch-loops \
  -Werror=unused-but-set-variable \
  -Werror=unused-but-set-parameter \
  -Werror=unused-but-set-variable \
  -Wmaybe-uninitialized \
  -Wno-error=maybe-uninitialized \
  -Wno-error=unused-but-set-variable \
  -Wno-error=unused-but-set-parameter \
  -Wno-error=unused-but-set-variable \
  -Wno-free-nonheap-object \
  -Wno-literal-suffix \
  -Wno-maybe-uninitialized \
  -Wno-old-style-declaration \
  -Wno-psabi \
  -Wno-unused-but-set-variable \
  -Wno-unused-but-set-parameter \
  -Wno-unused-local-typedefs
  -Wno-unused-but-set-variable \
  -Wno-unused-local-typedefs \
  -Wunused-but-set-parameter \
  -Wunused-but-set-variable

# Clang flags for all host rules
CLANG_CONFIG_HOST_EXTRA_ASFLAGS :=