diff options
| author | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-08 11:58:00 +1100 |
|---|---|---|
| committer | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-08 11:58:00 +1100 |
| commit | 9e81ab5228f793bb1fca11565e907cbaa2441db4 (patch) | |
| tree | 622da2625c4ec0d724aa0754e0c448e16e889c0c /android | |
| parent | 7de5c03cfbe7ab3af62a642b986fcfae7feb45ee (diff) | |
| parent | ee482fbf6ece4486af19e2bf879e729343cf7b07 (diff) | |
| download | qtlocation-mapboxgl-9e81ab5228f793bb1fca11565e907cbaa2441db4.tar.gz | |
Merge branch 'android-mason' of https://github.com/mapbox/mapbox-gl-native into android-mason
Diffstat (limited to 'android')
| -rw-r--r-- | android/java/app/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/java/lib/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/mapboxgl-app.gyp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/android/java/app/src/main/AndroidManifest.xml b/android/java/app/src/main/AndroidManifest.xml index 83995b8d3d..b3e55dd97f 100644 --- a/android/java/app/src/main/AndroidManifest.xml +++ b/android/java/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ android:versionCode="1" android:versionName="1.0" > - <uses-feature android:glEsVersion="0x00020000" /> + <uses-feature android:glEsVersion="0x00020000" android:required="true" /> <uses-permission android:name="android.permission.INTERNET"/> diff --git a/android/java/lib/src/main/AndroidManifest.xml b/android/java/lib/src/main/AndroidManifest.xml index 482bfb4d30..4a88441790 100644 --- a/android/java/lib/src/main/AndroidManifest.xml +++ b/android/java/lib/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ android:versionCode="1" android:versionName="1.0" > - <uses-feature android:glEsVersion="0x00020000" /> + <uses-feature android:glEsVersion="0x00020000" android:required="true" /> <uses-permission android:name="android.permission.INTERNET"/> diff --git a/android/mapboxgl-app.gyp b/android/mapboxgl-app.gyp index b4702be4f7..6c6dc72e32 100644 --- a/android/mapboxgl-app.gyp +++ b/android/mapboxgl-app.gyp @@ -47,7 +47,7 @@ '../mapboxgl.gyp:copy_certificate_bundle', ], 'copies': [{ - 'files': [ '../styles/styles' ], + 'files': [ '../styles' ], 'destination': '<(PRODUCT_DIR)' }], }, |