diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-10-07 19:41:21 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-10-07 19:43:23 -0700 |
| commit | 7a5c5d730f6fd06e41ba846f2423f78293094676 (patch) | |
| tree | 26a05f9f1ae79cb98d1eb06c77b8fbe0c5c48532 | |
| parent | c18b2b28c2d8c0879061b9d8ef38fad9e72b5ef2 (diff) | |
| download | build-7a5c5d730f6fd06e41ba846f2423f78293094676.tar.gz | |
Update for flags passed from Soong
Obsolete more GCC-specific flags, TARGET_(arm|thumb)_CFLAGS now contains
pre-filtered clang flags, and GLOBAL_CLANG_CFLAGS_NO_OVERRIDE now
contains all flags instead of just the clang additional flags.
Test: m
Change-Id: I068f155041e681068d38e1a5b6b04d354b85ccee
| -rw-r--r-- | core/binary.mk | 8 | ||||
| -rw-r--r-- | core/config.mk | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/core/binary.mk b/core/binary.mk index b8ee423ad1..07fb48a503 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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)) diff --git a/core/config.mk b/core/config.mk index eca980e6e0..b9174b3eb0 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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 |