summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d48d21f38c..c303999a12 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ android:
cp build/android/out/$(BUILDTYPE)/lib.target/libmapbox-gl.so android/java/lib/src/main/jniLibs/armeabi-v7a/libmapbox-gl.so && \
mkdir -p android/java/lib/src/main/assets && \
cp build/android/out/$(BUILDTYPE)/ca-bundle.crt android/java/lib/src/main/assets/ca-bundle.crt && \
- cp build/android/out/$(BUILDTYPE)/styles/package.json android/java/lib/src/main/assets/styles/package.json && \ # Ensures error when no styles submodule loaded
+ cp build/android/out/$(BUILDTYPE)/styles/package.json android/java/lib/src/main/assets/styles/package.json && \
cp -r build/android/out/$(BUILDTYPE)/styles android/java/lib/src/main/assets/styles && \
cd android/java && \
./gradlew build
diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
index 08208657b4..e1359de1b4 100644
--- a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
+++ b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
@@ -511,6 +511,8 @@ public class MapView extends SurfaceView {
int height) {
Log.v(TAG, "surfaceChanged");
Log.i(TAG, "resize " + format + " " + width + " " + height);
+ Log.v(TAG, "calling map resize with " + (int) (width / mScreenDensity) + "," + (int) (height / mScreenDensity) + "," +
+ mScreenDensity + "," + width + "," + height);
mNativeMapView.resize((int) (width / mScreenDensity), (int) (height / mScreenDensity),
mScreenDensity, width, height);
}