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

Unified Diff: shell/BUILD.gn

Issue 805113002: Moves android specific code into android directory (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: merge 2 trunk Created 6 years 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 | « no previous file | shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java » ('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 54685559be53e5424c73d223cfd3d2d89b60be1e..c9856e0873cbce95353bcd1b8700899222260235 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -160,8 +160,6 @@ source_set("lib") {
"task_runners.h",
"test_child_process.cc",
"test_child_process.h",
- "ui_application_loader_android.cc",
- "ui_application_loader_android.h",
]
deps = [
@@ -192,10 +190,12 @@ source_set("lib") {
if (is_android) {
sources += [
- "android/android_handler.h",
"android/android_handler.cc",
- "android/android_handler_loader.h",
+ "android/android_handler.h",
"android/android_handler_loader.cc",
+ "android/android_handler_loader.h",
+ "android/ui_application_loader_android.cc",
+ "android/ui_application_loader_android.h",
]
deps += [
@@ -223,7 +223,7 @@ if (is_android) {
"android/apk/src/org/chromium/mojo_shell_apk/Bootstrap.java",
"android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java",
]
- jni_package = "mojo"
+ jni_package = "mojo/shell"
}
android_library("bootstrap_java") {
« no previous file with comments | « no previous file | shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698