diff options
| author | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-08 12:49:46 +1100 |
|---|---|---|
| committer | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-08 12:49:46 +1100 |
| commit | c0bcd1e2601d8edd6dd8d346e3874a83e2ddae0c (patch) | |
| tree | 52515b69f6d1c4d5c3753d49d4af8d4aa429cfc4 /Makefile | |
| parent | 9e81ab5228f793bb1fca11565e907cbaa2441db4 (diff) | |
| download | qtlocation-mapboxgl-c0bcd1e2601d8edd6dd8d346e3874a83e2ddae0c.tar.gz | |
Add cache path variable from Java
Use cache path for db location
Add Assetbridge to extract asset files to cache path
Fix SSL by using extracted ca bundle
Use file:// style URL using extracted styles
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -87,6 +87,9 @@ android: $(MAKE) -C build/android BUILDTYPE=$(BUILDTYPE) V=$(V) androidapp && \ mkdir -p android/java/lib/src/main/jniLibs/armeabi-v7a && \ 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 -r build/android/out/$(BUILDTYPE)/styles android/java/lib/src/main/assets/styles && \ cd android/java && \ ./gradlew build @@ -154,7 +157,7 @@ clean: clear_xcode_cache -rm -rf ./macosx/build/ -rm -rf ./config.gypi ./config-ios.gypi ./config-android.gypi -rm -rf ./android/java/build ./android/java/app/build ./android/java/lib/build - -rm -rf ./android/java/lib/src/main/jniLibs + -rm -rf ./android/java/lib/src/main/jniLibs ./android/java/lib/src/main/assets distclean: clean -rm -rf ./mason_packages |