Update FDO options to match what is needed by the framework

platform_tools/android/gyp_gen/makefile_writer.py

 #!/usr/bin/python
 
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Functions for creating an Android.mk from already created dictionaries.
 """
@@ skipping 176 matching lines @@
   if target_dir:
     target_file = os.path.join(target_dir, target_file)
   with open(target_file, 'w') as f:
     f.write(AUTOGEN_WARNING)
     f.write('BASE_PATH := $(call my-dir)\n')
     write_local_path(f)
 
     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
     # budgets (i.e. larger than the low-end devices that initially shipped)
     # On arm, only define the flag if it has VFP. For all other architectures,
     # always define the flag.
     f.write('ifeq ($(TARGET_ARCH),arm)\n')
     f.write('\tifeq ($(ARCH_ARM_HAVE_VFP),true)\n')
     f.write('\t\tLOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE\n')
     f.write('\tendif\n')
@@ skipping 14 matching lines @@
       if data.condition:
         f.write('ifeq ($(%s), true)\n' % data.condition)
       write_local_vars(f, data.vars_dict, True, data.name)
       if data.condition:
         f.write('endif\n\n')
 
     write_include_stlport(f)
     f.write('include $(BUILD_SHARED_LIBRARY)\n')
     f.write(SKIA_TOOLS)