From: Stephen Hines <srhines@google.com>
Date: Tue, 2 Dec 2014 18:52:12 +0000 (+0000)
Subject: am 4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."
X-Git-Tag: android-x86-6.0-r1~144^2~324
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b2f55103;p=android-x86%2Fbuild.git

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

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

b2f5510365be26e279a8d02770a9f46e57741d54
diff --cc core/binary.mk
index d34814ed4,862aa8c6e..cea2cfc6e
--- a/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)