Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
build
Commits
46cb2ee3
Commit
46cb2ee3
authored
10 years ago
by
Dan Albert
Committed by
Gerrit Code Review
10 years ago
Browse files
Options
Download
Plain Diff
Merge "Force some clang Werrors that *will* break things."
parents
ed6e4d19
d1600411
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
4 deletions
+19
-4
core/binary.mk
core/binary.mk
+6
-0
core/config.mk
core/config.mk
+6
-1
core/definitions.mk
core/definitions.mk
+6
-3
core/product.mk
core/product.mk
+1
-0
No files found.
core/binary.mk
View file @
46cb2ee3
...
...
@@ -40,6 +40,8 @@ my_shared_libraries := $(LOCAL_SHARED_LIBRARIES)
my_cflags
:=
$(LOCAL_CFLAGS)
my_conlyflags
:=
$(LOCAL_CONLYFLAGS)
my_cppflags
:=
$(LOCAL_CPPFLAGS)
my_cflags_no_override
:=
$(GLOBAL_CFLAGS_NO_OVERRIDE)
my_cppflags_no_override
:=
$(GLOBAL_CPPFLAGS_NO_OVERRIDE)
my_ldflags
:=
$(LOCAL_LDFLAGS)
my_ldlibs
:=
$(LOCAL_LDLIBS)
my_asflags
:=
$(LOCAL_ASFLAGS)
...
...
@@ -1031,6 +1033,8 @@ ifeq ($(my_clang),true)
my_cflags
+=
$(LOCAL_CLANG_CFLAGS)
my_conlyflags
+=
$(LOCAL_CLANG_CONLYFLAGS)
my_cppflags
+=
$(LOCAL_CLANG_CPPFLAGS)
my_cflags_no_override
+=
$(GLOBAL_CLANG_CFLAGS_NO_OVERRIDE)
my_cppflags_no_override
+=
$(GLOBAL_CLANG_CPPFLAGS_NO_OVERRIDE)
my_asflags
+=
$(LOCAL_CLANG_ASFLAGS)
my_ldflags
+=
$(LOCAL_CLANG_LDFLAGS)
my_cflags
+=
$
(
LOCAL_CLANG_CFLAGS_
$
(
$(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)
ARCH
))
$
(
LOCAL_CLANG_CFLAGS_
$(my_32_64_bit_suffix)
)
...
...
@@ -1055,6 +1059,8 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASFLAGS := $(my_asflags)
$(LOCAL_INTERMEDIATE_TARGETS)
:
PRIVATE_CONLYFLAGS := $(my_conlyflags)
$(LOCAL_INTERMEDIATE_TARGETS)
:
PRIVATE_CFLAGS := $(my_cflags)
$(LOCAL_INTERMEDIATE_TARGETS)
:
PRIVATE_CPPFLAGS := $(my_cppflags)
$(LOCAL_INTERMEDIATE_TARGETS)
:
PRIVATE_CFLAGS_NO_OVERRIDE := $(my_cflags_no_override)
$(LOCAL_INTERMEDIATE_TARGETS)
:
PRIVATE_CPPFLAGS_NO_OVERRIDE := $(my_cppflags_no_override)
$(LOCAL_INTERMEDIATE_TARGETS)
:
PRIVATE_RTTI_FLAG := $(LOCAL_RTTI_FLAG)
$(LOCAL_INTERMEDIATE_TARGETS)
:
PRIVATE_DEBUG_CFLAGS := $(debug_cflags)
$(LOCAL_INTERMEDIATE_TARGETS)
:
PRIVATE_C_INCLUDES := $(my_c_includes)
...
...
This diff is collapsed.
Click to expand it.
core/config.mk
View file @
46cb2ee3
...
...
@@ -117,10 +117,15 @@ COMMON_RELEASE_CFLAGS:= -DNDEBUG -UDEBUG
COMMON_GLOBAL_CPPFLAGS
:=
$(COMMON_GLOBAL_CFLAGS)
-Wsign-promo
-std
=
gnu++11
COMMON_RELEASE_CPPFLAGS
:=
$(COMMON_RELEASE_CFLAGS)
GLOBAL_CFLAGS_NO_OVERRIDE
:=
\
GLOBAL_CFLAGS_NO_OVERRIDE
:=
\
-Werror
=
int-to-pointer-cast
\
-Werror
=
pointer-to-int-cast
\
GLOBAL_CLANG_CFLAGS_NO_OVERRIDE
:=
\
-Werror
=
address-of-temporary
\
-Werror
=
null-dereference
\
-Werror
=
return
-type
\
GLOBAL_CPPFLAGS_NO_OVERRIDE
:=
# Set the extensions used for various packages
...
...
This diff is collapsed.
Click to expand it.
core/definitions.mk
View file @
46cb2ee3
...
...
@@ -1032,8 +1032,8 @@ $(hide) $(PRIVATE_CXX) \
$(PRIVATE_CFLAGS)
\
$(PRIVATE_CPPFLAGS)
\
$(PRIVATE_DEBUG_CFLAGS)
\
$(
GLOBAL
_CFLAGS_NO_OVERRIDE)
\
$(
GLOBAL
_CPPFLAGS_NO_OVERRIDE)
\
$(
PRIVATE
_CFLAGS_NO_OVERRIDE)
\
$(
PRIVATE
_CPPFLAGS_NO_OVERRIDE)
\
-MD
-MF
$(patsubst
%.o,%.d,$@)
-o
$@
$<
$(transform-d-to-p)
endef
...
...
@@ -1070,7 +1070,7 @@ $(call transform-c-or-s-to-o-no-deps, \
$(PRIVATE_CFLAGS)
\
$(PRIVATE_CONLYFLAGS)
\
$(PRIVATE_DEBUG_CFLAGS)
\
$(
GLOBAL
_CFLAGS_NO_OVERRIDE))
$(
PRIVATE
_CFLAGS_NO_OVERRIDE))
endef
define
transform-s-to-o-no-deps
...
...
@@ -1137,6 +1137,8 @@ $(hide) $(PRIVATE_CXX) \
$(PRIVATE_CFLAGS)
\
$(PRIVATE_CPPFLAGS)
\
$(PRIVATE_DEBUG_CFLAGS)
\
$(PRIVATE_CFLAGS_NO_OVERRIDE)
\
$(PRIVATE_CPPFLAGS_NO_OVERRIDE)
\
-MD
-MF
$(patsubst
%.o,%.d,$@)
-o
$@
$<
$(transform-d-to-p)
endef
...
...
@@ -1163,6 +1165,7 @@ $(hide) $(PRIVATE_CC) \
$(PRIVATE_HOST_GLOBAL_CONLYFLAGS)
\
)
\
$(1)
\
$(PRIVATE_CFLAGS_NO_OVERRIDE)
\
-MD
-MF
$(patsubst
%.o,%.d,$@)
-o
$@
$<
endef
...
...
This diff is collapsed.
Click to expand it.
core/product.mk
View file @
46cb2ee3
...
...
@@ -270,6 +270,7 @@ _product_stash_var_list += \
_product_stash_var_list
+=
\
GLOBAL_CFLAGS_NO_OVERRIDE
\
GLOBAL_CPPFLAGS_NO_OVERRIDE
\
GLOBAL_CLANG_CFLAGS_NO_OVERRIDE
\
#
# Stash values of the variables in _product_stash_var_list.
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment