diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-07-01 17:04:43 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-04 10:04:27 +0200 |
commit | 0d7f22fc672b4a0c1273ead0b581706902bdc649 (patch) | |
tree | e86a5a5c23fd37f0242c028ea1efb235b8b00805 /tests/auto/android | |
parent | 3e8783f5bbef75fd55e2f26857c8b7fdbdf327b6 (diff) |
Make sure libgnustl_shared.so is deployed along with Qt libs
Since configure no longer puts this in $QTDIR/lib, we need to
copy it from the NDK and into the device ourselves.
Task-number: QTBUG-32079
Change-Id: I75ee5f8a00de9a1ba536bcfd857e6b2e7a0e1f6e
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'tests/auto/android')
-rwxr-xr-x | tests/auto/android/runtests.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/android/runtests.pl b/tests/auto/android/runtests.pl index 7bb6833859..35cadda498 100755 --- a/tests/auto/android/runtests.pl +++ b/tests/auto/android/runtests.pl @@ -232,6 +232,7 @@ if ($deploy_qt) print ("cp -L $_ $temp_dir/lib\n"); system("cp -L $_ $temp_dir/lib"); } + system("cp -L $android_ndk_dir/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/libgnustl_shared.so $temp_dir/lib"); system("cp -a plugins $temp_dir"); system("cp -a imports $temp_dir"); system("cp -a qml $temp_dir"); |