@@ -164,12 +164,28 @@ source_set("fml") {
164164 }
165165
166166 if (is_fuchsia ) {
167- sources += [ " platform/fuchsia/paths_fuchsia.cc" ]
167+ sources += [
168+ " platform/fuchsia/message_loop_fuchsia.cc" ,
169+ " platform/fuchsia/message_loop_fuchsia.h" ,
170+ " platform/fuchsia/paths_fuchsia.cc" ,
171+ ]
168172
169173 if (using_fuchsia_sdk ) {
170- public_deps += [ " $fuchsia_sdk_root /pkg:trace" ]
174+ public_deps += [
175+ " $fuchsia_sdk_root /pkg:async-cpp" ,
176+ " $fuchsia_sdk_root /pkg:async-loop-cpp" ,
177+ " $fuchsia_sdk_root /pkg:async-loop-default" ,
178+ " $fuchsia_sdk_root /pkg:trace" ,
179+ " $fuchsia_sdk_root /pkg:zx" ,
180+ ]
171181 } else {
172- public_deps += [ " //zircon/public/lib/trace" ]
182+ public_deps += [
183+ " //zircon/public/lib/async-cpp" ,
184+ " //zircon/public/lib/async-loop-cpp" ,
185+ " //zircon/public/lib/async-loop-default" ,
186+ " //zircon/public/lib/trace" ,
187+ " //zircon/public/lib/zx" ,
188+ ]
173189 }
174190 }
175191
@@ -205,31 +221,29 @@ executable("fml_unittests") {
205221 sources = [
206222 " base32_unittest.cc" ,
207223 " command_line_unittest.cc" ,
224+ " gpu_thread_merger_unittests.cc" ,
208225 " memory/ref_counted_unittest.cc" ,
209226 " memory/weak_ptr_unittest.cc" ,
210227 " message_loop_task_queues_merge_unmerge_unittests.cc" ,
228+ " message_loop_task_queues_unittests.cc" ,
229+ " message_loop_unittests.cc" ,
211230 " message_unittests.cc" ,
212231 " paths_unittests.cc" ,
213232 " platform/darwin/string_range_sanitization_unittests.mm" ,
233+ " synchronization/count_down_latch_unittests.cc" ,
214234 " synchronization/semaphore_unittest.cc" ,
215235 " synchronization/sync_switch_unittest.cc" ,
216236 " synchronization/waitable_event_unittest.cc" ,
217237 " thread_local_unittests.cc" ,
238+ " thread_unittests.cc" ,
218239 " time/time_delta_unittest.cc" ,
219240 " time/time_point_unittest.cc" ,
220241 " time/time_unittest.cc" ,
221242 ]
222243
223244 # TODO(gw280 ): Figure out why these tests don't work currently on Fuchsia
224245 if (! is_fuchsia ) {
225- sources += [
226- " file_unittest.cc" ,
227- " gpu_thread_merger_unittests.cc" ,
228- " message_loop_task_queues_unittests.cc" ,
229- " message_loop_unittests.cc" ,
230- " synchronization/count_down_latch_unittests.cc" ,
231- " thread_unittests.cc" ,
232- ]
246+ sources += [ " file_unittest.cc" ]
233247 }
234248
235249 deps = [
0 commit comments