summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2014-11-13 18:15:29 -0800
committerJustin R. Miller <incanus@codesorcery.net>2014-11-13 18:15:29 -0800
commitdce0f0b6d947a3273f4f5181e83975048818f048 (patch)
tree32afd404d7e92a6e29c147fa5ae62df63ebe78f9 /Makefile
parent990be6743f07411e6bc89f010f9dc64587b44e97 (diff)
downloadqtlocation-mapboxgl-dce0f0b6d947a3273f4f5181e83975048818f048.tar.gz
Revert "Fix Makefile"
This reverts commit 990be6743f07411e6bc89f010f9dc64587b44e97.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c303999a12..d48d21f38c 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