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

Commit 13baa319 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 876f45e7: Merge "Make some warnings impossible to override." 

* commit '876f45e7':
  Make some warnings impossible to override.
parents 2c5b6ab5 876f45e7

core/config.mk

+6 −0
Original line number Original line Diff line number Diff line
@@ -119,6 +119,12 @@ COMMON_RELEASE_CFLAGS:= -DNDEBUG -UDEBUG 
COMMON_GLOBAL_CPPFLAGS:= $(COMMON_GLOBAL_CFLAGS) -Wsign-promo -std=gnu++11

COMMON_GLOBAL_CPPFLAGS:= $(COMMON_GLOBAL_CFLAGS) -Wsign-promo -std=gnu++11

COMMON_RELEASE_CPPFLAGS:= $(COMMON_RELEASE_CFLAGS)

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

# Set the extensions used for various packages

COMMON_PACKAGE_SUFFIX := .zip

COMMON_PACKAGE_SUFFIX := .zip

COMMON_JAVA_PACKAGE_SUFFIX := .jar

COMMON_JAVA_PACKAGE_SUFFIX := .jar

core/definitions.mk

+7 −1
Original line number Original line Diff line number Diff line
@@ -990,6 +990,8 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_CFLAGS) \

	$(PRIVATE_CFLAGS) \

	$(PRIVATE_CPPFLAGS) \

	$(PRIVATE_CPPFLAGS) \

	$(PRIVATE_DEBUG_CFLAGS) \

	$(PRIVATE_DEBUG_CFLAGS) \

	$(GLOBAL_CFLAGS_NO_OVERRIDE) \

	$(GLOBAL_CPPFLAGS_NO_OVERRIDE) \

	-MD -MF $(patsubst %.o,%.d,$@) -o $@ $<

	-MD -MF $(patsubst %.o,%.d,$@) -o $@ $<

$(transform-d-to-p)

$(transform-d-to-p)

endef

endef
@@ -1022,7 +1024,11 @@ endef 




define transform-c-to-o-no-deps

define transform-c-to-o-no-deps

@echo "target $(PRIVATE_ARM_MODE) C: $(PRIVATE_MODULE) <= $<"

@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

endef





define transform-s-to-o-no-deps

define transform-s-to-o-no-deps

core/product.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -267,6 +267,10 @@ _product_stash_var_list += \ 
	WITH_DEXPREOPT \

	WITH_DEXPREOPT \

	WITH_DEXPREOPT_BOOT_IMG_ONLY

	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.

# Stash values of the variables in _product_stash_var_list.

# $(1): Renamed prefix

# $(1): Renamed prefix