Make some warnings impossible to override.

These CFLAGS and CPPFLAGS will always be added last, and are
controlled by the build system. This way we can add warnings that
users are not allowed to disable.

Change-Id: Id71f69249078f62ca2687ecbf764aff0fd3a1c1b
This commit is contained in:
Dan Albert
2015-02-21 12:45:26 -08:00
parent 0f672c6aad
commit 0c91fa84ff
3 changed files with 17 additions and 1 deletions

View File

@@ -118,6 +118,12 @@ 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 := \
-Werror=int-to-pointer-cast \
-Werror=pointer-to-int-cast \
GLOBAL_CPPFLAGS_NO_OVERRIDE :=
# Set the extensions used for various packages
COMMON_PACKAGE_SUFFIX := .zip
COMMON_JAVA_PACKAGE_SUFFIX := .jar

View File

@@ -990,6 +990,8 @@ $(hide) $(PRIVATE_CXX) \
$(PRIVATE_CFLAGS) \
$(PRIVATE_CPPFLAGS) \
$(PRIVATE_DEBUG_CFLAGS) \
$(GLOBAL_CFLAGS_NO_OVERRIDE) \
$(GLOBAL_CPPFLAGS_NO_OVERRIDE) \
-MD -MF $(patsubst %.o,%.d,$@) -o $@ $<
$(transform-d-to-p)
endef
@@ -1022,7 +1024,11 @@ endef
define transform-c-to-o-no-deps
@echo "target $(PRIVATE_ARM_MODE) C: $(PRIVATE_MODULE) <= $<"
$(call transform-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_CONLYFLAGS) $(PRIVATE_DEBUG_CFLAGS))
$(call transform-c-or-s-to-o-no-deps, \
$(PRIVATE_CFLAGS) \
$(PRIVATE_CONLYFLAGS) \
$(PRIVATE_DEBUG_CFLAGS) \
$(GLOBAL_CFLAGS_NO_OVERRIDE))
endef
define transform-s-to-o-no-deps

View File

@@ -266,6 +266,10 @@ _product_stash_var_list += \
WITH_DEXPREOPT \
WITH_DEXPREOPT_BOOT_IMG_ONLY
_product_stash_var_list += \
GLOBAL_CFLAGS_NO_OVERRIDE \
GLOBAL_CPPFLAGS_NO_OVERRIDE \
#
# Stash values of the variables in _product_stash_var_list.
# $(1): Renamed prefix