diff options
| author | Leith Bade <leith@mapbox.com> | 2015-09-24 09:18:38 +1000 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-09-24 10:38:03 +1000 |
| commit | 18bc490f40e997bc2a1cbaa2cf82a9ffd2fa2405 (patch) | |
| tree | 81c5dcdd9797eed0674ab3d18cd90d682b2eee78 /android | |
| parent | 15cffcd3a2137ce97a093e114aa4d3e71fd9990b (diff) | |
| download | qtlocation-mapboxgl-18bc490f40e997bc2a1cbaa2cf82a9ffd2fa2405.tar.gz | |
Fix build with Crashlytics NDK on 64bit
Diffstat (limited to 'android')
| -rw-r--r-- | android/java/.gitignore | 2 | ||||
| -rw-r--r-- | android/mapboxgl-app.gypi | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/android/java/.gitignore b/android/java/.gitignore index a79fb8fae5..626b995946 100644 --- a/android/java/.gitignore +++ b/android/java/.gitignore @@ -11,9 +11,7 @@ build/ *.apk # JNI -MapboxGLAndroidSDK/src/main/libs/ MapboxGLAndroidSDK/src/main/jniLibs/ -MapboxGLAndroidSDK/src/main/obj/ MapboxGLAndroidSDK/src/main/obj.target/ # Lib assets diff --git a/android/mapboxgl-app.gypi b/android/mapboxgl-app.gypi index 7a8c52d5b6..74415df7b4 100644 --- a/android/mapboxgl-app.gypi +++ b/android/mapboxgl-app.gypi @@ -91,7 +91,7 @@ { 'action_name': 'Strip dynamic library', 'inputs': [ '<(PRODUCT_DIR)/lib.target/libmapbox-gl.so' ], - 'outputs': [ '<(pwd)/../android/java/MapboxGLAndroidSDK/src/main/libs/$(JNIDIR)/libmapbox-gl.so' ], + 'outputs': [ '<(pwd)/../android/java/MapboxGLAndroidSDK/src/main/jniLibs/$(JNIDIR)/libmapbox-gl.so' ], 'action': [ '$(STRIP)', '<@(_inputs)', '-o', '<@(_outputs)' ] }, ], |