diff options
author | Attila Dusnoki <dati91@gmail.com> | 2016-08-15 14:59:22 +0200 |
---|---|---|
committer | Attila Dusnoki <dati91@gmail.com> | 2016-09-06 12:48:04 +0200 |
commit | ccc66d0c3202641ae6079aa169a46540f00d8c73 (patch) | |
tree | afb78696a41d422f5c973b32a81a718733cf42dc /support | |
parent | 5f702d6e7f26710b7a24cce3c013a040255f7096 (diff) | |
download | servo-ccc66d0c3202641ae6079aa169a46540f00d8c73.tar.gz servo-ccc66d0c3202641ae6079aa169a46540f00d8c73.zip |
WebBluetooth Android support
Diffstat (limited to 'support')
-rw-r--r-- | support/android/apk/AndroidManifest.xml | 3 | ||||
-rw-r--r-- | support/android/apk/src/com/mozilla/servo/MainActivity.java | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/support/android/apk/AndroidManifest.xml b/support/android/apk/AndroidManifest.xml index 10e31d7ea83..9f2eea71e97 100644 --- a/support/android/apk/AndroidManifest.xml +++ b/support/android/apk/AndroidManifest.xml @@ -8,9 +8,12 @@ <uses-sdk android:minSdkVersion="18" /> <uses-feature android:glEsVersion="0x00020000" android:required="true"></uses-feature> + <uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.BLUETOOTH" /> + <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> <application android:label="Servo" android:icon="@mipmap/servo"> <activity android:name="com.mozilla.servo.MainActivity" diff --git a/support/android/apk/src/com/mozilla/servo/MainActivity.java b/support/android/apk/src/com/mozilla/servo/MainActivity.java index cb82e637dbf..c2c220c3081 100644 --- a/support/android/apk/src/com/mozilla/servo/MainActivity.java +++ b/support/android/apk/src/com/mozilla/servo/MainActivity.java @@ -13,6 +13,7 @@ public class MainActivity extends android.app.NativeActivity { private static final String LOGTAG="servo_wrapper"; static { Log.i(LOGTAG, "Loading the NativeActivity"); + System.loadLibrary("main"); } private void set_url(String url) { |