Updates to Android.mk generation.

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 26 matching lines @@
 
 def write_local_vars(f, var_dict, append, name):
   """
   Helper function to write all the members of var_dict to the makefile.
   @param f File open for writing (Android.mk)
   @param var_dict VarsDict holding the unique values for one configuration.
   @param append Whether to append to each makefile variable or overwrite it.
   @param name If not None, a string to be appended to each key.
   """
   for key in var_dict.keys():
+    _key = key
+    _items = var_dict[key]
     if key == 'LOCAL_CFLAGS':
       # Always append LOCAL_CFLAGS. This allows us to define some early on in
       # the makefile and not overwrite them.
       _append = True
+    elif key == 'DEFINES':
+      # For DEFINES, we want to append to LOCAL_CFLAGS.
+      _append = True
+      _key = 'LOCAL_CFLAGS'
+      _items_with_D = []
+      for define in _items:
+        _items_with_D.append('-D' + define)
+      _items = _items_with_D
     elif key == 'KNOWN_TARGETS':
       # KNOWN_TARGETS are not needed in the final make file.
       continue
     else:
       _append = append
-    _key = key
     if name:
       _key += '_' + name
-    write_group(f, _key, var_dict[key], _append)
+    write_group(f, _key, _items, _append)
 
 
 AUTOGEN_WARNING = (
 """
 ###############################################################################
 #
 # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
 #
 ###############################################################################
 
@@ skipping 109 matching lines @@
     f.write('\tLOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE\n')
     f.write('endif\n\n')
 
     f.write('# used for testing\n')
     f.write('#LOCAL_CFLAGS += -g -O0\n\n')
 
     f.write('ifeq ($(NO_FALLBACK_FONT),true)\n')
     f.write('\tLOCAL_CFLAGS += -DNO_FALLBACK_FONT\n')
     f.write('endif\n\n')
 
+    f.write('ifeq ($(TARGET_ARCH),arm64)\n')
+    f.write('    $(warning TODOArm64: Unlike arm32, arm64 has no inline'
+            ' assembly for performance critical code.)\n')
+    f.write('endif\n\n')
+
     write_local_vars(f, common, False, None)
 
     for data in deviations_from_common:
       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')
 
     f.write('include external/stlport/libstlport.mk\n')
     f.write('LOCAL_MODULE:= libskia\n')
     f.write('include $(BUILD_SHARED_LIBRARY)\n')
     f.write(SKIA_TOOLS)