Update FDO options to match what is needed by the framework

R=tomhudson@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/497503003
This commit is contained in:
djsollen 2014-08-21 07:38:31 -07:00 committed by Commit bot
parent 729776c810
commit 6bf35c2100
2 changed files with 14 additions and 0 deletions

View File

@ -194,7 +194,16 @@ def write_android_mk(target_dir, common, deviations_from_common):
f.write(DEBUGGING_HELP)
write_clear_vars(f)
# need flags to enable feedback driven optimization (FDO) when requested
# by the build system.
f.write('LOCAL_FDO_SUPPORT := true\n')
f.write(
'ifneq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_CFLAGS)),)\n')
f.write('\t# This should be the last -Oxxx specified in LOCAL_CFLAGS\n')
f.write('\tLOCAL_CFLAGS += -O2\n')
f.write('endif\n\n')
f.write('LOCAL_ARM_MODE := thumb\n')
# need a flag to tell the C side when we're on devices with large memory

View File

@ -34,6 +34,11 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_FDO_SUPPORT := true
ifneq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_CFLAGS)),)
# This should be the last -Oxxx specified in LOCAL_CFLAGS
LOCAL_CFLAGS += -O2
endif
LOCAL_ARM_MODE := thumb
ifeq ($(TARGET_ARCH),arm)
ifeq ($(ARCH_ARM_HAVE_VFP),true)