am 4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."

* commit '4bad2d2156bcb589c2d1bb223a074edc39aa428c':
  Add more support for GLOBAL_CONLYFLAGS.

diff --cc core/binary.mk
index d34814e,862aa8c..cea2cfc
--- 1/core/binary.mk
--- 2/core/binary.mk
+++ b/core/binary.mk
@@@ -999,24 -1006,9 +1008,24 @@@ my_asflags := $(call $(LOCAL_2ND_ARCH_V
  my_ldflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_ldflags))
  endif
  
 +ifeq ($(LOCAL_FDO_SUPPORT), true)
 +  build_with_fdo := false
 +  ifeq ($(BUILD_FDO_INSTRUMENT), true)
 +    build_with_fdo := true
 +  endif
 +  ifeq ($(BUILD_FDO_OPTIMIZE), true)
 +    build_with_fdo := true
 +  endif
 +  ifeq ($(build_with_fdo), true)
 +    my_cflags := $(patsubst -Os,-O2,$(my_cflags))
 +    fdo_incompatible_flags=-fno-early-inlining -finline-limit=%
 +    my_cflags := $(filter-out $(fdo_incompatible_flags),$(my_cflags))
 +  endif
 +endif
 +
  $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_YACCFLAGS := $(LOCAL_YACCFLAGS)
  $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASFLAGS := $(my_asflags)
- $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CONLYFLAGS := $(LOCAL_CONLYFLAGS)
+ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CONLYFLAGS := $(my_conlyflags)
  $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CFLAGS := $(my_cflags)
  $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CPPFLAGS := $(my_cppflags)
  $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RTTI_FLAG := $(LOCAL_RTTI_FLAG)

diff --cc core/clear_vars.mk
Simple merge