summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/gfx/gfx.gyp10
-rw-r--r--ui/ui_unittests.gyp5
2 files changed, 10 insertions, 5 deletions
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index 6b69cb1..dd0de8a 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -517,6 +517,16 @@
'interpolated_transform_unittest.cc',
],
}],
+ ['OS == "android"', {
+ 'sources': [
+ 'android/scroller_unittest.cc',
+ ],
+ }],
+ ['OS == "android" and gtest_target_type == "shared_library"', {
+ 'dependencies': [
+ '../../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }],
],
}
],
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp
index 2cc68b4..4110292 100644
--- a/ui/ui_unittests.gyp
+++ b/ui/ui_unittests.gyp
@@ -135,11 +135,6 @@
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
}],
- ['OS == "android"', {
- 'sources': [
- 'gfx/android/scroller_unittest.cc',
- ],
- }],
['OS == "android" and gtest_target_type == "shared_library"', {
'dependencies': [
'../testing/android/native_test.gyp:native_test_native_code',