Index: ui/shell_dialogs/BUILD.gn |
diff --git a/ui/shell_dialogs/BUILD.gn b/ui/shell_dialogs/BUILD.gn |
index 88764d1f113430ef45be94c5ba5368ab59a9bfb3..005f912cea94298be8b54b9f2c4f10743150ffcd 100644 |
--- a/ui/shell_dialogs/BUILD.gn |
+++ b/ui/shell_dialogs/BUILD.gn |
@@ -52,7 +52,7 @@ component("shell_dialogs") { |
deps += [ "//ui/aura" ] |
} |
- if (is_android) { |
+ if (is_android && !use_aura) { |
brettw
2015/10/21 02:51:03
What I would do for this:
if (is_android) {
if
mfomitchev
2015/10/21 22:44:04
Done - I think. There's nothing in <rest of the st
|
deps += [ |
"//ui/android", |
"//ui/android:ui_java", |
@@ -62,6 +62,19 @@ component("shell_dialogs") { |
libs = [ "jnigraphics" ] |
} |
+ if (is_android && use_aura) { |
+ sources += [ |
+ "select_file_dialog_auraandroid.cc", |
+ "select_file_dialog_auraandroid.h", |
+ ] |
+ sources -= [ |
+ "android/shell_dialogs_jni_registrar.cc", |
+ "android/shell_dialogs_jni_registrar.h", |
+ "select_file_dialog_android.cc", |
+ "select_file_dialog_android.h", |
+ ] |
+ } |
+ |
if (is_win) { |
deps += [ "//win8:metro_viewer" ] |
} |