Updates to Android.mk generation.

platform_tools/android/gyp_gen/gypd_parser.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 parsing the gypd output from gyp.
 """
 
-import vars_dict_lib
-
 def parse_dictionary(var_dict, d, current_target_name):
   """
   Helper function to get the meaningful entries in a dictionary.
   @param var_dict VarsDict object for storing the results of the parsing.
   @param d Dictionary object to parse.
   @param current_target_name The current target being parsed. If this
                              dictionary is a target, this will be its entry
                              'target_name'. Otherwise, this will be the name of
                              the target which contains this dictionary.
   """
@@ skipping 58 matching lines @@
     include = include.replace('..', '$(LOCAL_PATH)', 1)
     # Remove a trailing slash, if present.
     if include.endswith('/'):
       include = include[:-1]
     var_dict.LOCAL_C_INCLUDES.add(include)
     # For the top level, libskia, include directories should be exported.
     if current_target_name == 'libskia':
       var_dict.LOCAL_EXPORT_C_INCLUDE_DIRS.add(include)
 
   for define in d.get('defines', []):
-    var_dict.LOCAL_CFLAGS.add('-D' + define)
+    var_dict.DEFINES.add(define)
 
 
 def parse_gypd(var_dict, path, desired_targets=None):
   """
   Parse a gypd file.
   @param var_dict VarsDict object for storing the result of the parse.
   @param path Path to gypd file.
   @param desired_targets List of targets to be parsed from this file. If empty,
                          parse all targets.
   """
@@ skipping 10 matching lines @@
       # Avoid circular dependencies
       continue
     if desired_targets and target_name not in desired_targets:
       # Our caller does not depend on this one
       continue
     # Add it to our known targets so we don't parse it again
     var_dict.KNOWN_TARGETS.add(target_name)
 
     parse_dictionary(var_dict, target, target_name)