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

Commit 4548e7f4 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Remove AndroidConfig.h."

parents 35da9685 43146118

core/clang/config.mk

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ CLANG_CONFIG_EXTRA_CFLAGS += \ 
  -Werror=int-conversion



# Disable overly aggressive warning for macros defined with a leading underscore

# This happens in AndroidConfig.h, which is included nearly everywhere.

# This used to happen in AndroidConfig.h, which was included everywhere.

# TODO: can we remove this now?

CLANG_CONFIG_EXTRA_CFLAGS += \

  -Wno-reserved-id-macro

core/combo/TARGET_linux-arm.mk

+1 −6
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
# You can set TARGET_ARCH_VARIANT to use an arch version other

# than ARMv5TE. Each value should correspond to a file named

# $(BUILD_COMBOS)/arch/<name>.mk which must contain

# makefile variable definitions similar to the preprocessor

# defines in build/core/combo/include/arch/<combo>/AndroidConfig.h. Their

# makefile variable definitions. Their

# purpose is to allow module Android.mk files to selectively compile

# different versions of code based upon the funtionality and

# instructions available in a given architecture version.
@@ -92,8 +91,6 @@ ifeq ($(FORCE_ARM_DEBUGGING),true) 
  $(combo_2nd_arch_prefix)TARGET_thumb_CFLAGS += -marm -fno-omit-frame-pointer

endif



android_config_h := $(call select-android-config-h,linux-arm)



$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \

			-msoft-float \

			-ffunction-sections \
@@ -107,8 +104,6 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ 
			-no-canonical-prefixes \

			-fno-canonical-system-headers \

			$(arch_variant_cflags) \

			-include $(android_config_h) \

			-I $(dir $(android_config_h))



# The "-Wunused-but-set-variable" option often breaks projects that enable

# "-Wall -Werror" due to a commom idiom "ALOGV(mesg)" where ALOGV is turned

core/combo/TARGET_linux-arm64.mk

+1 −6
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
# You can set TARGET_ARCH_VARIANT to use an arch version other

# than ARMv5TE. Each value should correspond to a file named

# $(BUILD_COMBOS)/arch/<name>.mk which must contain

# makefile variable definitions similar to the preprocessor

# defines in build/core/combo/include/arch/<combo>/AndroidConfig.h. Their

# makefile variable definitions. Their

# purpose is to allow module Android.mk files to selectively compile

# different versions of code based upon the funtionality and

# instructions available in a given architecture version.
@@ -70,8 +69,6 @@ TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined 
TARGET_GLOBAL_CFLAGS += \

    -fno-strict-aliasing \



android_config_h := $(call select-android-config-h,linux-arm64)



TARGET_GLOBAL_CFLAGS += \

			-fstack-protector \

			-ffunction-sections \
@@ -84,8 +81,6 @@ TARGET_GLOBAL_CFLAGS += \ 
			-no-canonical-prefixes \

			-fno-canonical-system-headers \

			$(arch_variant_cflags) \

			-include $(android_config_h) \

			-I $(dir $(android_config_h))



# Help catch common 32/64-bit errors.

TARGET_GLOBAL_CFLAGS += \

core/combo/TARGET_linux-mips.mk

+1 −6
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
# You can set TARGET_ARCH_VARIANT to use an arch version other

# than mips32r2-fp. Each value should correspond to a file named

# $(BUILD_COMBOS)/arch/<name>.mk which must contain

# makefile variable definitions similar to the preprocessor

# defines in build/core/combo/include/arch/<combo>/AndroidConfig.h. Their

# makefile variable definitions. Their

# purpose is to allow module Android.mk files to selectively compile

# different versions of code based upon the funtionality and

# instructions available in a given architecture version.
@@ -79,8 +78,6 @@ ifeq ($(FORCE_MIPS_DEBUGGING),true) 
  TARGET_mips_CFLAGS += -fno-omit-frame-pointer

endif



android_config_h := $(call select-android-config-h,linux-mips)



$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \

			$(TARGET_mips_CFLAGS) \

			-U__unix -U__unix__ -Umips \
@@ -93,8 +90,6 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ 
			-no-canonical-prefixes \

			-fno-canonical-system-headers \

			$(arch_variant_cflags) \

			-include $(android_config_h) \

			-I $(dir $(android_config_h))



ifneq ($(ARCH_MIPS_PAGE_SHIFT),)

$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -DPAGE_SHIFT=$(ARCH_MIPS_PAGE_SHIFT)

core/combo/TARGET_linux-mips64.mk

+1 −6
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
# You can set TARGET_ARCH_VARIANT to use an arch version other

# than mips64r6. Each value should correspond to a file named

# $(BUILD_COMBOS)/arch/<name>.mk which must contain

# makefile variable definitions similar to the preprocessor

# defines in build/core/combo/include/arch/<combo>/AndroidConfig.h. Their

# makefile variable definitions. Their

# purpose is to allow module Android.mk files to selectively compile

# different versions of code based upon the funtionality and

# instructions available in a given architecture version.
@@ -79,8 +78,6 @@ ifeq ($(FORCE_MIPS_DEBUGGING),true) 
  TARGET_mips_CFLAGS += -fno-omit-frame-pointer

endif



android_config_h := $(call select-android-config-h,linux-mips64)



TARGET_GLOBAL_CFLAGS += \

			$(TARGET_mips_CFLAGS) \

			-U__unix -U__unix__ -Umips \
@@ -93,8 +90,6 @@ TARGET_GLOBAL_CFLAGS += \ 
			-no-canonical-prefixes \

			-fno-canonical-system-headers \

			$(arch_variant_cflags) \

			-include $(android_config_h) \

			-I $(dir $(android_config_h))



# Help catch common 32/64-bit errors.

TARGET_GLOBAL_CFLAGS += \