Index: platform_tools/android/gyp_gen/makefile_writer.py |
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py |
index 55a71d00ca00b14ae4e9e078a1f197e36afea9f0..dbefa5ee838b2cd297b54a7616ec4a77e1680c97 100644 |
--- a/platform_tools/android/gyp_gen/makefile_writer.py |
+++ b/platform_tools/android/gyp_gen/makefile_writer.py |
@@ -198,8 +198,7 @@ def write_android_mk(target_dir, common, deviations_from_common): |
# 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('ifneq ($(strip $(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') |