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 | 6 |
| 7 if (is_android) { | 7 if (is_android) { |
| 8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
| 9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
| 10 } | 10 } |
| (...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 690 sources = [ | 690 sources = [ |
| 691 "../android/java/src/org/chromium/ui/base/Clipboard.java", | 691 "../android/java/src/org/chromium/ui/base/Clipboard.java", |
| 692 "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java", | 692 "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java", |
| 693 "../android/java/src/org/chromium/ui/base/LocalizationUtils.java", | 693 "../android/java/src/org/chromium/ui/base/LocalizationUtils.java", |
| 694 "../android/java/src/org/chromium/ui/base/ResourceBundle.java", | 694 "../android/java/src/org/chromium/ui/base/ResourceBundle.java", |
| 695 "../android/java/src/org/chromium/ui/base/SelectFileDialog.java", | 695 "../android/java/src/org/chromium/ui/base/SelectFileDialog.java", |
| 696 "../android/java/src/org/chromium/ui/base/TouchDevice.java", | 696 "../android/java/src/org/chromium/ui/base/TouchDevice.java", |
| 697 "../android/java/src/org/chromium/ui/base/ViewAndroid.java", | 697 "../android/java/src/org/chromium/ui/base/ViewAndroid.java", |
| 698 "../android/java/src/org/chromium/ui/base/WindowAndroid.java", | 698 "../android/java/src/org/chromium/ui/base/WindowAndroid.java", |
| 699 ] | 699 ] |
| 700 deps = [ | |
| 701 ":ui_base_touch_device_java_enums", | |
| 702 ] | |
| 700 jni_package = "base" | 703 jni_package = "base" |
| 701 } | 704 } |
| 705 java_cpp_enum("ui_base_touch_device_java_enums") { | |
|
mkosiba (inactive)
2014/11/10 22:06:04
in gn you can have all of the enums in one target
mustaq
2014/11/26 16:28:45
Done.
| |
| 706 sources = [ | |
| 707 "touch/touch_device.h", | |
| 708 ] | |
| 709 outputs = [ | |
| 710 "org/chromium/ui/base/PointerType.java", | |
| 711 ] | |
| 712 } | |
| 702 } | 713 } |
| 703 | 714 |
| 704 # TODO(GYP): Make this work on Android and reenable it. | 715 # TODO(GYP): Make this work on Android and reenable it. |
| 705 if (!is_android) { | 716 if (!is_android) { |
| 706 # TODO(tfarina): Rename this target to ui_base_unittests. | 717 # TODO(tfarina): Rename this target to ui_base_unittests. |
| 707 # In order to do this we will need to keep this target, add a dummy | 718 # In order to do this we will need to keep this target, add a dummy |
| 708 # ui_base_unittests target that just points to ui_unittests, change | 719 # ui_base_unittests target that just points to ui_unittests, change |
| 709 # buildbot code to reference the new 'ui_base_unittests' target. | 720 # buildbot code to reference the new 'ui_base_unittests' target. |
| 710 # After buildbot is updated, we can make the changes in Chromium and | 721 # After buildbot is updated, we can make the changes in Chromium and |
| 711 # remove 'ui_unittests' target. crbug.com/331829 | 722 # remove 'ui_unittests' target. crbug.com/331829 |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 897 "//ui/chromeos/resources", | 908 "//ui/chromeos/resources", |
| 898 "//ui/chromeos/strings", | 909 "//ui/chromeos/strings", |
| 899 "//ui/chromeos:ui_chromeos", | 910 "//ui/chromeos:ui_chromeos", |
| 900 "//ui/events:gesture_detection", | 911 "//ui/events:gesture_detection", |
| 901 "//ui/message_center:message_center", | 912 "//ui/message_center:message_center", |
| 902 ] | 913 ] |
| 903 } | 914 } |
| 904 } | 915 } |
| 905 } | 916 } |
| 906 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk). | 917 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk). |
| OLD | NEW |