| 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/nacl/config.gni") |    5 import("//build/config/nacl/config.gni") | 
|    6 import("//testing/test.gni") |    6 import("//testing/test.gni") | 
|    7 import("../../../mojo/public/tools/bindings/mojom.gni") |    7 import("../../../mojo/public/tools/bindings/mojom.gni") | 
|    8  |    8  | 
|    9 if (is_android) { |    9 if (is_android) { | 
|   10   import("//build/config/android/config.gni") |   10   import("//build/config/android/config.gni") | 
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  103   } |  103   } | 
|  104  |  104  | 
|  105   if (is_nacl && !is_nacl_nonsfi) { |  105   if (is_nacl && !is_nacl_nonsfi) { | 
|  106     sources -= [ |  106     sources -= [ | 
|  107       "broker_host.cc", |  107       "broker_host.cc", | 
|  108       "broker_posix.cc", |  108       "broker_posix.cc", | 
|  109       "channel_posix.cc", |  109       "channel_posix.cc", | 
|  110     ] |  110     ] | 
|  111   } |  111   } | 
|  112  |  112  | 
|  113   # Use target_os == "chromeos" instead of is_chromeos because we need to |  | 
|  114   # build NaCl targets (i.e. IRT) for ChromeOS the same as the rest of ChromeOS. |  | 
|  115   if (is_android || target_os == "chromeos") { |  | 
|  116     defines += [ "MOJO_EDK_LEGACY_PROTOCOL" ] |  | 
|  117   } |  | 
|  118  |  | 
|  119   allow_circular_includes_from = [ "//mojo/edk/embedder" ] |  113   allow_circular_includes_from = [ "//mojo/edk/embedder" ] | 
|  120 } |  114 } | 
|  121  |  115  | 
|  122 group("tests") { |  116 group("tests") { | 
|  123   testonly = true |  117   testonly = true | 
|  124   deps = [ |  118   deps = [ | 
|  125     ":mojo_system_unittests", |  119     ":mojo_system_unittests", | 
|  126   ] |  120   ] | 
|  127  |  121  | 
|  128   if (!is_ios) { |  122   if (!is_ios) { | 
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  204       ":test_utils", |  198       ":test_utils", | 
|  205       "//base", |  199       "//base", | 
|  206       "//base/test:test_support", |  200       "//base/test:test_support", | 
|  207       "//mojo/edk/system", |  201       "//mojo/edk/system", | 
|  208       "//mojo/edk/test:run_all_perftests", |  202       "//mojo/edk/test:run_all_perftests", | 
|  209       "//mojo/edk/test:test_support", |  203       "//mojo/edk/test:test_support", | 
|  210       "//testing/gtest", |  204       "//testing/gtest", | 
|  211     ] |  205     ] | 
|  212   } |  206   } | 
|  213 } |  207 } | 
| OLD | NEW |