diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-25 23:13:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-25 23:13:13 +0000 |
| commit | 876f45e73f938cdaa7cfc25c43822fc6b274f105 (patch) | |
| tree | 3be14421d64ff2c5763b6778e115af106bd03e68 | |
| parent | 8389deee6b355f7dd6b1ff3579179414c6a41e5c (diff) | |
| parent | 0c91fa84ff8e5f29dbe3a492fc7898eb1eb63b2a (diff) | |
| download | build-876f45e73f938cdaa7cfc25c43822fc6b274f105.zip build-876f45e73f938cdaa7cfc25c43822fc6b274f105.tar.gz build-876f45e73f938cdaa7cfc25c43822fc6b274f105.tar.bz2 | |
Merge "Make some warnings impossible to override."
| -rw-r--r-- | core/config.mk | 6 | ||||
| -rw-r--r-- | core/definitions.mk | 8 | ||||
| -rw-r--r-- | core/product.mk | 4 |
3 files changed, 17 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk index 4ce525c..ecc8044 100644 --- a/core/config.mk +++ b/core/config.mk @@ -119,6 +119,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 diff --git a/core/definitions.mk b/core/definitions.mk index 37f7d9d..9845556 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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 diff --git a/core/product.mk b/core/product.mk index 6bba6b8..ff65672 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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 |