AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert of Move from libstlport to libc++ for Android framework builds (patchset #1 id:1 of https://codereview.chromium.org/714113002/)

Browse Source 
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
This commit is contained in:
scroggo 2014-11-11 13:58:44 -08:00 committed by Commit bot
parent 4052a8e4f2
commit 3c3fe7ce48
6 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform_tools/android/bin/android_gdbserver
View File

@ -29,7 +29,6 @@ else
fi fi
for library_file in \ for library_file in \
libc.so \ libc.so \
libc++.so \
libstdc++.so \ libstdc++.so \
libm.so \ libm.so \
liblog.so \ liblog.so \

1
platform_tools/android/bin/android_perf
View File

@ -41,7 +41,6 @@ perf_setup() {
echo "Copying symbol files" 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/libc++.so $TMP_SYS_LIB
adb_pull_if_needed /system/lib/libstlport.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/libGLESv2.so $TMP_SYS_LIB
adb_pull_if_needed /system/lib/libandroid.so $TMP_SYS_LIB adb_pull_if_needed /system/lib/libandroid.so $TMP_SYS_LIB

9
platform_tools/android/gyp_gen/makefile_writer.py
View File

@ -161,6 +161,14 @@ def write_clear_vars(f):
""" """
f.write('include $(CLEAR_VARS)\n') 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): def write_android_mk(target_dir, common, deviations_from_common):
"""Given all the variables, write the final make file. """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: if data.condition:
f.write('endif\n\n') f.write('endif\n\n')
write_include_stlport(f)
f.write('include $(BUILD_SHARED_LIBRARY)\n') f.write('include $(BUILD_SHARED_LIBRARY)\n')
f.write(SKIA_TOOLS) f.write(SKIA_TOOLS)

2
platform_tools/android/gyp_gen/tool_makefile_writer.py
View File

@ -34,6 +34,8 @@ def write_tool_android_mk(target_dir, var_dict):
makefile_writer.write_group(f, 'LOCAL_PICKUP_FILES', makefile_writer.write_group(f, 'LOCAL_PICKUP_FILES',
['$(LOCAL_PATH)/../resources'], False) ['$(LOCAL_PATH)/../resources'], False)
makefile_writer.write_include_stlport(f)
f.write('include $(BUILD_NATIVE_TEST)\n') f.write('include $(BUILD_NATIVE_TEST)\n')

1
platform_tools/android/tests/expectations/Android.mk
View File

@ -148,6 +148,7 @@ LOCAL_MODULE_TAGS_bar += \
LOCAL_MODULE_bar += \ LOCAL_MODULE_bar += \
local_module_bar local_module_bar
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
############################################################# #############################################################

1
platform_tools/android/tests/expectations/tool/Android.mk
View File

@ -40,4 +40,5 @@ LOCAL_MODULE := \
LOCAL_PICKUP_FILES := \ LOCAL_PICKUP_FILES := \
$(LOCAL_PATH)/../resources $(LOCAL_PATH)/../resources
include external/stlport/libstlport.mk
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)