diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | android/java/.gitignore | 2 | ||||
| -rw-r--r-- | android/mapboxgl-app.gypi | 2 |
3 files changed, 2 insertions, 4 deletions
@@ -131,7 +131,7 @@ clean: clear_sqlite_cache clear_xcode_cache -rm -rf ./test/build -rm -rf ./config/*.gypi -rm -rf ./android/java/build ./android/java/MapboxGLAndroidSDK/build ./android/java/MapboxGLAndroidSDKTestApp/build - -rm -rf ./android/java/MapboxGLAndroidSDK/src/main/libs ./android/java/MapboxGLAndroidSDK/src/main/obj.target ./android/java/MapboxGLAndroidSDK/src/main/assets + -rm -rf ./android/java/MapboxGLAndroidSDK/src/main/jniLibs ./android/java/MapboxGLAndroidSDK/src/main/obj.target ./android/java/MapboxGLAndroidSDK/src/main/assets -rm -f ./android/test/features.zip distclean: clean 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)' ] }, ], |