Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 if (is_android) { | 7 if (is_android) { |
| 8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
| 9 } | 9 } |
| 10 | 10 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 45 ] | 45 ] |
| 46 | 46 |
| 47 if (use_aura) { | 47 if (use_aura) { |
| 48 if (is_mac) { | 48 if (is_mac) { |
| 49 # Will be automatically filtered out on non-Mac. | 49 # Will be automatically filtered out on non-Mac. |
| 50 sources -= [ "select_file_dialog_mac.mm" ] | 50 sources -= [ "select_file_dialog_mac.mm" ] |
| 51 } | 51 } |
| 52 deps += [ "//ui/aura" ] | 52 deps += [ "//ui/aura" ] |
| 53 } | 53 } |
| 54 | 54 |
| 55 if (is_android) { | 55 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
| |
| 56 deps += [ | 56 deps += [ |
| 57 "//ui/android", | 57 "//ui/android", |
| 58 "//ui/android:ui_java", | 58 "//ui/android:ui_java", |
| 59 "//ui/base:ui_base_jni_headers", | 59 "//ui/base:ui_base_jni_headers", |
| 60 ] | 60 ] |
| 61 include_dirs = [ "$root_gen_dir/ui" ] | 61 include_dirs = [ "$root_gen_dir/ui" ] |
| 62 libs = [ "jnigraphics" ] | 62 libs = [ "jnigraphics" ] |
| 63 } | 63 } |
| 64 | 64 |
| 65 if (is_android && use_aura) { | |
| 66 sources += [ | |
| 67 "select_file_dialog_auraandroid.cc", | |
| 68 "select_file_dialog_auraandroid.h", | |
| 69 ] | |
| 70 sources -= [ | |
| 71 "android/shell_dialogs_jni_registrar.cc", | |
| 72 "android/shell_dialogs_jni_registrar.h", | |
| 73 "select_file_dialog_android.cc", | |
| 74 "select_file_dialog_android.h", | |
| 75 ] | |
| 76 } | |
| 77 | |
| 65 if (is_win) { | 78 if (is_win) { |
| 66 deps += [ "//win8:metro_viewer" ] | 79 deps += [ "//win8:metro_viewer" ] |
| 67 } | 80 } |
| 68 } | 81 } |
| 69 | 82 |
| 70 test("shell_dialogs_unittests") { | 83 test("shell_dialogs_unittests") { |
| 71 sources = [ | 84 sources = [ |
| 72 "select_file_dialog_win_unittest.cc", | 85 "select_file_dialog_win_unittest.cc", |
| 73 ] | 86 ] |
| 74 | 87 |
| 75 deps = [ | 88 deps = [ |
| 76 ":shell_dialogs", | 89 ":shell_dialogs", |
| 77 "//base", | 90 "//base", |
| 78 "//base/test:test_support", | 91 "//base/test:test_support", |
| 79 "//base/test:run_all_unittests", | 92 "//base/test:run_all_unittests", |
| 80 "//testing/gtest", | 93 "//testing/gtest", |
| 81 ] | 94 ] |
| 82 } | 95 } |
| OLD | NEW |