Index: ui/shell_dialogs/BUILD.gn |
diff --git a/ui/shell_dialogs/BUILD.gn b/ui/shell_dialogs/BUILD.gn |
index 88764d1f113430ef45be94c5ba5368ab59a9bfb3..1f89f44416d6d27947052a102b5a4a7cc1363a62 100644 |
--- a/ui/shell_dialogs/BUILD.gn |
+++ b/ui/shell_dialogs/BUILD.gn |
@@ -22,6 +22,8 @@ component("shell_dialogs") { |
"select_file_dialog.h", |
"select_file_dialog_android.cc", |
"select_file_dialog_android.h", |
+ "select_file_dialog_auraandroid.cc", |
sky
2015/10/15 21:51:47
Can you conditionally include below rather than li
mfomitchev
2015/10/15 22:12:40
Are there some guidelines which explain when it's
brettw
2015/10/20 02:49:26
You should conditionally include now unless for so
mfomitchev
2015/10/20 17:55:44
Thanks Brett! Done.
|
+ "select_file_dialog_auraandroid.h", |
"select_file_dialog_factory.cc", |
"select_file_dialog_factory.h", |
"select_file_dialog_mac.h", |
@@ -52,7 +54,7 @@ component("shell_dialogs") { |
deps += [ "//ui/aura" ] |
} |
- if (is_android) { |
+ if (is_android && !use_aura) { |
deps += [ |
"//ui/android", |
"//ui/android:ui_java", |
@@ -62,6 +64,20 @@ component("shell_dialogs") { |
libs = [ "jnigraphics" ] |
} |
+ 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", |
+ ] |
+ } else { |
+ sources -= [ |
+ "select_file_dialog_auraandroid.cc", |
+ "select_file_dialog_auraandroid.h", |
+ ] |
+ } |
+ |
if (is_win) { |
deps += [ "//win8:metro_viewer" ] |
} |