diff options
| author |  scroggo <scroggo@google.com> | 2014-11-11 13:58:44 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-11 13:58:44 -0800 |
| commit | 3c3fe7ce4893204eb8bcf885e8a1d539763bca5d (patch) | |
| tree | de8919159c47eac83222678cfb77e3965032aa88 /platform_tools/android | |
| parent | 4052a8e4f2b54fb999163edfeec64b0f2c8b9c47 (diff) | |
Revert of Move from libstlport to libc++ for Android framework builds (patchset #1 id:1 of https://codereview.chromium.org/714113002/)
Reason for revert:
The code this depends on is not ready yet. We can submit once https://android-review.googlesource.com/#/c/113924/ is submitted.
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
Review URL: https://codereview.chromium.org/718793003
Diffstat (limited to 'platform_tools/android')
6 files changed, 13 insertions, 2 deletions
diff --git a/platform_tools/android/bin/android_gdbserver b/platform_tools/android/bin/android_gdbserver index f3ee6b99b3..b1391c737f 100755 --- a/platform_tools/android/bin/android_gdbserver +++ b/platform_tools/android/bin/android_gdbserver @@ -29,7 +29,6 @@ else fi for library_file in \ libc.so \ - libc++.so \ libstdc++.so \ libm.so \ liblog.so \ diff --git a/platform_tools/android/bin/android_perf b/platform_tools/android/bin/android_perf index 726908283d..c5baedcf26 100755 --- a/platform_tools/android/bin/android_perf +++ b/platform_tools/android/bin/android_perf @@ -41,7 +41,6 @@ perf_setup() { echo "Copying symbol files" adb_pull_if_needed /system/lib/libc.so $TMP_SYS_LIB - adb_pull_if_needed /system/lib/libc++.so $TMP_SYS_LIB adb_pull_if_needed /system/lib/libstlport.so $TMP_SYS_LIB adb_pull_if_needed /system/lib/libGLESv2.so $TMP_SYS_LIB adb_pull_if_needed /system/lib/libandroid.so $TMP_SYS_LIB diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py index 0105e1dc57..d8d0c6196f 100644 --- a/platform_tools/android/gyp_gen/makefile_writer.py +++ b/platform_tools/android/gyp_gen/makefile_writer.py @@ -161,6 +161,14 @@ 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. @@ -225,6 +233,7 @@ 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) diff --git a/platform_tools/android/gyp_gen/tool_makefile_writer.py b/platform_tools/android/gyp_gen/tool_makefile_writer.py index 2dacb042b6..0bf7e129e3 100644 --- a/platform_tools/android/gyp_gen/tool_makefile_writer.py +++ b/platform_tools/android/gyp_gen/tool_makefile_writer.py @@ -34,6 +34,8 @@ def write_tool_android_mk(target_dir, var_dict): makefile_writer.write_group(f, 'LOCAL_PICKUP_FILES', ['$(LOCAL_PATH)/../resources'], False) + makefile_writer.write_include_stlport(f) + f.write('include $(BUILD_NATIVE_TEST)\n') diff --git a/platform_tools/android/tests/expectations/Android.mk b/platform_tools/android/tests/expectations/Android.mk index daa2125acd..f5fbc29209 100644 --- a/platform_tools/android/tests/expectations/Android.mk +++ b/platform_tools/android/tests/expectations/Android.mk @@ -148,6 +148,7 @@ LOCAL_MODULE_TAGS_bar += \ LOCAL_MODULE_bar += \ local_module_bar +include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) ############################################################# diff --git a/platform_tools/android/tests/expectations/tool/Android.mk b/platform_tools/android/tests/expectations/tool/Android.mk index 10a5fb2207..ea990e9133 100644 --- a/platform_tools/android/tests/expectations/tool/Android.mk +++ b/platform_tools/android/tests/expectations/tool/Android.mk @@ -40,4 +40,5 @@ LOCAL_MODULE := \ LOCAL_PICKUP_FILES := \ $(LOCAL_PATH)/../resources +include external/stlport/libstlport.mk include $(BUILD_NATIVE_TEST) |