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

Unified Diff: ui/shell_dialogs/BUILD.gn

Issue 1409793002: Aura on Android: Stub implementation of SelectFileDialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_snapshot
Patch Set: Addding a missing import. Created 5 years, 2 months 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 | ui/shell_dialogs/select_file_dialog_auraandroid.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/shell_dialogs/BUILD.gn
diff --git a/ui/shell_dialogs/BUILD.gn b/ui/shell_dialogs/BUILD.gn
index 88764d1f113430ef45be94c5ba5368ab59a9bfb3..9696e9839fd87a3b3a009c2c34c7bda9d0c25460 100644
--- a/ui/shell_dialogs/BUILD.gn
+++ b/ui/shell_dialogs/BUILD.gn
@@ -10,8 +10,6 @@ if (is_android) {
component("shell_dialogs") {
sources = [
- "android/shell_dialogs_jni_registrar.cc",
- "android/shell_dialogs_jni_registrar.h",
"base_shell_dialog.cc",
"base_shell_dialog.h",
"base_shell_dialog_win.cc",
@@ -20,8 +18,6 @@ component("shell_dialogs") {
"linux_shell_dialog.h",
"select_file_dialog.cc",
"select_file_dialog.h",
- "select_file_dialog_android.cc",
- "select_file_dialog_android.h",
"select_file_dialog_factory.cc",
"select_file_dialog_factory.h",
"select_file_dialog_mac.h",
@@ -52,7 +48,13 @@ component("shell_dialogs") {
deps += [ "//ui/aura" ]
}
- if (is_android) {
+ if (is_android && !use_aura) {
+ sources += [
+ "android/shell_dialogs_jni_registrar.cc",
+ "android/shell_dialogs_jni_registrar.h",
+ "select_file_dialog_android.cc",
+ "select_file_dialog_android.h",
+ ]
deps += [
"//ui/android",
"//ui/android:ui_java",
@@ -62,6 +64,13 @@ component("shell_dialogs") {
libs = [ "jnigraphics" ]
}
+ if (is_android && use_aura) {
+ sources += [
+ "select_file_dialog_auraandroid.cc",
+ "select_file_dialog_auraandroid.h",
+ ]
+ }
+
if (is_win) {
deps += [ "//win8:metro_viewer" ]
}
« no previous file with comments | « no previous file | ui/shell_dialogs/select_file_dialog_auraandroid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698