Update android SDK to API version 23.
Also handles new android permission API by requesting needed permission
upfront.
R=etiennej@chromium.org
BUG=Fixes https://github.com/domokit/mojo/issues/495
Review URL: https://codereview.chromium.org/1431663002 .
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index 43a1bb6..fbf9166 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -331,6 +331,7 @@
android_library("java") {
java_files = [
"android/apk/src/org/chromium/mojo/shell/AndroidHandler.java",
+ "android/apk/src/org/chromium/mojo/shell/BaseActivity.java",
"android/apk/src/org/chromium/mojo/shell/FileHelper.java",
"android/apk/src/org/chromium/mojo/shell/IntentReceiverActivity.java",
"android/apk/src/org/chromium/mojo/shell/IntentReceiverRegistry.java",
@@ -368,6 +369,7 @@
"//mojo/services/nfc/interfaces:interfaces_java",
"//services/keyboard",
"//services/native_viewport:native_viewport_java",
+ "//third_party/android_tools:android_support_v13_java",
]
}
@@ -648,7 +650,9 @@
":embed_pingable",
]
- data_deps = [ "//services/http_server:http_server($default_toolchain)" ]
+ data_deps = [
+ "//services/http_server:http_server($default_toolchain)",
+ ]
}
mojo_native_application("shell_nfc_apptests") {
