Reland "Move from libstlport to libc++ for Android framework builds"

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 143 matching lines @@
   f.write('LOCAL_PATH:= $(call my-dir)\n')
 
 def write_clear_vars(f):
   """Add the CLEAR_VARS line to the makefile.
 
   Args:
     f: File open for writing.
   """
   f.write('include $(CLEAR_VARS)\n')
 
-def write_include_stlport(f):
-  """Add a line to include stlport.
-
-  Args:
-    f: File open for writing.
-  """
-  f.write('include external/stlport/libstlport.mk\n')
-
 def write_android_mk(target_dir, common, deviations_from_common):
   """Given all the variables, write the final make file.
 
   Args:
     target_dir: The full path to the directory to write Android.mk, or None
       to use the current working directory.
     common: VarsDict holding variables definitions common to all
       configurations.
     deviations_from_common: List of VarsDictData, one for each possible
       configuration. VarsDictData.name will be appended to each key before
@@ skipping 44 matching lines @@
 
     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')
 
-    write_include_stlport(f)
     f.write('include $(BUILD_SHARED_LIBRARY)\n')
     f.write(SKIA_TOOLS)