From dce0f0b6d947a3273f4f5181e83975048818f048 Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Thu, 13 Nov 2014 18:15:29 -0800 Subject: [PATCH] Revert "Fix Makefile" This reverts commit 990be6743f07411e6bc89f010f9dc64587b44e97. --- Makefile | 2 +- .../java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c303999a1..d48d21f38 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 && \ + 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 -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 e1359de1b..08208657b 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,8 +511,6 @@ 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); }