diff options
| author |  scroggo <scroggo@google.com> | 2014-11-12 11:52:23 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-12 11:52:23 -0800 |
| commit | 8338a9a855cf5e5127dcb62e48d5036b1ad2f29b (patch) | |
| tree | 24030b6feb29291c22bf807b5299c2a09b7dbc80 /platform_tools/android/gyp_gen/makefile_writer.py | |
| parent | 09a79d09981ee363b1518bb40c108e6266bc28c6 (diff) | |
Reland "Move from libstlport to libc++ for Android framework builds" (patchset #1 id:1 of https://codereview.chromium.org/718793003/)
> Original issue's description:
> > Move from libstlport to libc++ for Android framework builds
> >
> > Committed: https://skia.googlesource.com/skia/+/ce259510a738fab05a0d456440104f5aba1c9d72
>
> TBR=tomhudson@google.com,djsollen@google.com
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://skia.googlesource.com/skia/+/3c3fe7ce4893204eb8bcf885e8a1d539763bca5d
TBR=tomhudson@google.com,djsollen@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/717303002
Diffstat (limited to 'platform_tools/android/gyp_gen/makefile_writer.py')
| -rw-r--r-- | platform_tools/android/gyp_gen/makefile_writer.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py index d8d0c6196f..0105e1dc57 100644 --- a/platform_tools/android/gyp_gen/makefile_writer.py +++ b/platform_tools/android/gyp_gen/makefile_writer.py @@ -161,14 +161,6 @@ def write_clear_vars(f): """ 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. @@ -233,7 +225,6 @@ def write_android_mk(target_dir, common, deviations_from_common): if data.condition: f.write('endif\n\n') - write_include_stlport(f) f.write('include $(BUILD_SHARED_LIBRARY)\n') f.write(SKIA_TOOLS) |