Move from libstlport to libc++ for Android framework builds

Review URL: https://codereview.chromium.org/714113002

diff --git a/platform_tools/android/bin/android_gdbserver b/platform_tools/android/bin/android_gdbserver
index b1391c737fd1d630af2d48be6157ff609be9fbdf..f3ee6b99b3e20467f55937a373f0dbf513d8e22a 100755 (executable)
--- a/platform_tools/android/bin/android_gdbserver
+++ b/platform_tools/android/bin/android_gdbserver
@@ -29,6 +29,7 @@ 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 c5baedcf26d3be6aa3ae57076d4c070a407d454c..726908283dd3832d2e2a5e9375df53f2314cba6f 100755 (executable)
--- a/platform_tools/android/bin/android_perf
+++ b/platform_tools/android/bin/android_perf
@@ -41,6 +41,7 @@ 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 d8d0c6196fe70e6ad1f751076ed8f9691ea70334..0105e1dc576989e89baf7f972b4a63bc4206b7f2 100644 (file)
--- 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)
 

diff --git a/platform_tools/android/gyp_gen/tool_makefile_writer.py b/platform_tools/android/gyp_gen/tool_makefile_writer.py
index 0bf7e129e346f5f9f20f9752ce7f6b91acd10386..2dacb042b6fc8c6858e4ee18d68d5312ef5c2cb2 100644 (file)
--- a/platform_tools/android/gyp_gen/tool_makefile_writer.py
+++ b/platform_tools/android/gyp_gen/tool_makefile_writer.py
@@ -34,8 +34,6 @@ 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 f5fbc292095ba826e1df0ba90cbe2f518f65e83c..daa2125acd78fa99983b0737ce35d9d0807e424c 100644 (file)
--- a/platform_tools/android/tests/expectations/Android.mk
+++ b/platform_tools/android/tests/expectations/Android.mk
@@ -148,7 +148,6 @@ 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 ea990e9133c952ab0ce9eb469dad32f9e32046cd..10a5fb220703dee00f71e970f4e2617b7f171083 100644 (file)
--- a/platform_tools/android/tests/expectations/tool/Android.mk
+++ b/platform_tools/android/tests/expectations/tool/Android.mk
@@ -40,5 +40,4 @@ LOCAL_MODULE := \
 LOCAL_PICKUP_FILES := \
        $(LOCAL_PATH)/../resources
 
-include external/stlport/libstlport.mk
 include $(BUILD_NATIVE_TEST)