Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Unified Diff: shell/BUILD.gn

Issue 1431663002: Update android SDK to API version 23. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Folloe review Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/android/config.gni ('k') | shell/android/apk/AndroidManifest.xml.jinja2 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/BUILD.gn
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index 43a1bb6dcf7b410d571f0eef0f69b7b0354e5ab6..fbf9166839bf590fbcb90c1f84c5bee1dde2afcf 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -331,6 +331,7 @@ if (is_android) {
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 @@ if (is_android) {
"//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 @@ mojo_native_application("apptests") {
":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") {
« no previous file with comments | « build/config/android/config.gni ('k') | shell/android/apk/AndroidManifest.xml.jinja2 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698