summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2018-10-12 12:08:59 +0200
committerTobrun <tobrun.van.nuland@gmail.com>2018-10-23 15:40:25 +0200
commit89aaaf518f6fc6a3768bfedcaf641f707c9da6c4 (patch)
tree020078b368a2a1ae7c99e588ad4bceed3d6faf43
parent9afe75aa76c02db21209e8f92b09be4b596a3983 (diff)
downloadqtlocation-mapboxgl-upstream/tvn-store-debug-symbols.tar.gz
[android] - store alternative .so files for running ndk-stack on crash reportsupstream/tvn-store-debug-symbols
-rw-r--r--Makefile2
-rw-r--r--circle.yml20
2 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 0ea3dfdb90..016b1e48c0 100644
--- a/Makefile
+++ b/Makefile
@@ -612,7 +612,7 @@ run-android-ui-test-$1-%: platform/android/gradle/configuration.gradle
# Symbolicate native stack trace with the specified abi
.PHONY: android-ndk-stack-$1
android-ndk-stack-$1: platform/android/gradle/configuration.gradle
- adb logcat | ndk-stack -sym platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/debug/obj/$2/
+ adb logcat | ndk-stack -sym platform/android/MapboxGLAndroidSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/$2/
# Run render tests with pixelmatch
.PHONY: run-android-render-test-$1
diff --git a/circle.yml b/circle.yml
index 04ce610020..363bf1bcad 100644
--- a/circle.yml
+++ b/circle.yml
@@ -554,9 +554,9 @@ jobs:
- run:
name: gzip debugable .so files
command: |
- gzip platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/debug/obj/armeabi-v7a/libmapbox-gl.so
+ gzip platform/android/MapboxGLAndroidSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/armeabi-v7a/libmapbox-gl.so
- store_artifacts:
- path: platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/debug/obj/armeabi-v7a/libmapbox-gl.so.gz
+ path: platform/android/MapboxGLAndroidSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/armeabi-v7a/libmapbox-gl.so.gz
- store_artifacts:
path: platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/debug
destination: .
@@ -613,21 +613,21 @@ jobs:
- run:
name: gzip debugable .so files
command: |
- gzip platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/release/obj/arm64-v8a/libmapbox-gl.so && \
- gzip platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/release/obj/armeabi-v7a/libmapbox-gl.so && \
- gzip platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/release/obj/x86/libmapbox-gl.so && \
- gzip platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/release/obj/x86_64/libmapbox-gl.so
+ gzip platform/android/MapboxGLAndroidSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/arm64-v8a/libmapbox-gl.so && \
+ gzip platform/android/MapboxGLAndroidSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/armeabi-v7a/libmapbox-gl.so && \
+ gzip platform/android/MapboxGLAndroidSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/x86/libmapbox-gl.so && \
+ gzip platform/android/MapboxGLAndroidSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/x86_64/libmapbox-gl.so
- store_artifacts:
path: platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/release
destination: .
- store_artifacts:
- path: platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/release/obj/arm64-v8a/libmapbox-gl.so.gz
+ path: platform/android/MapboxGLAndroidSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/arm64-v8a/libmapbox-gl.so.gz
- store_artifacts:
- path: platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/release/obj/armeabi-v7a/libmapbox-gl.so.gz
+ path: platform/android/MapboxGLAndroidSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/armeabi-v7a/libmapbox-gl.so.gz
- store_artifacts:
- path: platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/release/obj/x86/libmapbox-gl.so.gz
+ path: platform/android/MapboxGLAndroidSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/x86/libmapbox-gl.so.gz
- store_artifacts:
- path: platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/release/obj/x86_64/libmapbox-gl.so.gz
+ path: platform/android/MapboxGLAndroidSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/x86_64/libmapbox-gl.so.gz
- run:
name: Record size
command: platform/android/scripts/metrics.sh