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

Commit 159693a3 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Update for flags passed from Soong"

parents 976f1d45 7a5c5d73

core/binary.mk

+2 −6
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ my_header_libraries := $(LOCAL_HEADER_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_cflags_no_override := $(GLOBAL_CLANG_CFLAGS_NO_OVERRIDE)

my_cppflags_no_override := $(GLOBAL_CLANG_CPPFLAGS_NO_OVERRIDE)

my_ldflags := $(LOCAL_LDFLAGS)

my_ldlibs := $(LOCAL_LDLIBS)

my_asflags := $(LOCAL_ASFLAGS)
@@ -626,8 +626,6 @@ normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb) 
# actually used (although they are usually empty).

arm_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(arm_objects_mode)_CFLAGS)

normal_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(normal_objects_mode)_CFLAGS)

arm_objects_cflags := $(call convert-to-clang-flags,$(arm_objects_cflags))

normal_objects_cflags := $(call convert-to-clang-flags,$(normal_objects_cflags))



else

arm_objects_mode :=
@@ -1561,8 +1559,6 @@ endif 
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))

core/config.mk

+9 −0
Original line number Diff line number Diff line
@@ -99,6 +99,15 @@ $(KATI_obsolete_var \ 
  TARGET_CLANG_SUPPORTED 2ND_TARGET_CLANG_SUPPORTED \

  TARGET_CC 2ND_TARGET_CC \

  TARGET_CXX 2ND_TARGET_CXX \

  TARGET_TOOLCHAIN_ROOT 2ND_TARGET_TOOLCHAIN_ROOT \

  HOST_TOOLCHAIN_ROOT 2ND_HOST_TOOLCHAIN_ROOT \

  HOST_CROSS_TOOLCHAIN_ROOT 2ND_HOST_CROSS_TOOLCHAIN_ROOT \

  HOST_TOOLS_PREFIX 2ND_HOST_TOOLS_PREFIX \

  HOST_CROSS_TOOLS_PREFIX 2ND_HOST_CROSS_TOOLS_PREFIX \

  HOST_GCC_VERSION 2ND_HOST_GCC_VERSION \

  HOST_CROSS_GCC_VERSION 2ND_HOST_CROSS_GCC_VERSION \

  TARGET_NDK_GCC_VERSION 2ND_TARGET_NDK_GCC_VERSION \

  GLOBAL_CFLAGS_NO_OVERRIDE GLOBAL_CPPFLAGS_NO_OVERRIDE \

  ,GCC support has been removed. Use Clang instead)



# This is marked as obsolete in envsetup.mk after reading the BoardConfig.mk