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 { | 5 { |
6 'variables': { | 6 'variables': { |
7 'chromium_code': 1, | 7 'chromium_code': 1, |
8 }, | 8 }, |
9 'targets': [ | 9 'targets': [ |
10 { | 10 { |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
108 }], | 108 }], |
109 ], | 109 ], |
110 }], | 110 }], |
111 ['use_ozone==1 and use_pango==0', { | 111 ['use_ozone==1 and use_pango==0', { |
112 'sources!': [ | 112 'sources!': [ |
113 'font_list_unittest.cc', | 113 'font_list_unittest.cc', |
114 'font_unittest.cc', | 114 'font_unittest.cc', |
115 'text_elider_unittest.cc', | 115 'text_elider_unittest.cc', |
116 ], | 116 ], |
117 }], | 117 }], |
118 ['OS == "android"', { | |
119 'dependencies': [ | |
120 '../../testing/android/native_test.gyp:native_test_native_code', | |
msw
2014/06/02 17:36:08
Why is this specified as an explicit dependency in
cjhopman
2014/06/02 21:27:10
Yeah, I'd like to see us come up with something wh
msw
2014/06/02 21:32:47
cool, please do follow up or file a bug about this
| |
121 ], | |
122 }], | |
118 ], | 123 ], |
119 } | 124 } |
120 ], | 125 ], |
121 'conditions': [ | 126 'conditions': [ |
122 ['OS == "android"', { | 127 ['OS == "android"', { |
123 'targets': [ | 128 'targets': [ |
124 { | 129 { |
125 'target_name': 'gfx_unittests_apk', | 130 'target_name': 'gfx_unittests_apk', |
126 'type': 'none', | 131 'type': 'none', |
127 'dependencies': [ | 132 'dependencies': [ |
133 '../android/ui_android.gyp:ui_java', | |
128 'gfx_unittests', | 134 'gfx_unittests', |
129 ], | 135 ], |
130 'variables': { | 136 'variables': { |
131 'test_suite_name': 'gfx_unittests', | 137 'test_suite_name': 'gfx_unittests', |
132 }, | 138 }, |
133 'includes': [ '../../build/apk_test.gypi' ], | 139 'includes': [ '../../build/apk_test.gypi' ], |
134 }, | 140 }, |
135 ], | 141 ], |
136 }], | 142 }], |
137 ], | 143 ], |
138 } | 144 } |
OLD | NEW |