Index: BUILD.gn |
diff --git a/BUILD.gn b/BUILD.gn |
index e47ef757b7abc16dcb050d168a15e189ecd87ea3..3509921236a25de3ae59b76c2534e63ffd59b553 100644 |
--- a/BUILD.gn |
+++ b/BUILD.gn |
@@ -8,7 +8,9 @@ |
# you add a new build file, there must be some path of dependencies from this |
# file to your new one or GN won't know about it. |
+import("//build/config/features.gni") |
import("//build/config/ui.gni") |
+ |
if (is_android) { |
import("//build/config/android/config.gni") |
} |
@@ -161,6 +163,13 @@ group("root") { |
deps += [ "//ui/wm" ] |
} |
+ if (enable_nacl && enable_nacl_untrusted) { |
+ if (is_linux && cpu_arch == "x64") { |
+ # TODO(GYP): Add the right deps for the other architectures. |
+ deps += [ "//ppapi:ppapi_cpp_lib(//native_client/build/toolchain/nacl:clang_newlib_x64)" ] |
+ } |
+ } |
+ |
if (is_win) { |
deps += [ "//ui/metro_viewer" ] |
} |
@@ -302,3 +311,165 @@ group("root") { |
deps -= [ "//ui/touch_selection" ] |
} |
} |
+ |
+group("gyp_all") { |
+ testonly = true |
+ |
+ # TODO(GYP): This target should describe everything that is built by a GYP |
+ # build but not yet by a GN build, i.e., these are the targets that still |
+ # need to be ported to GN. Eventually this target should be identical to |
+ # gn_all. |
+ |
+ deps = [ |
+ ":gn_all", |
+ # "//extensions/shell:app_shell_unittests", # TODO(GYP) |
+ # "//chrome/test:chrome_app_unittests", # TODO(GYP) |
+ # "//chrome/test:chromedriver_unittests", # TODO(GYP) |
+ # "//chrome/test:performance_browser_tests", # TODO(GYP) |
+ # "//net:hpack_example_generator", # TODO(GYP) |
+ # "//net:hpack_fuzz_wrapper", # TODO(GYP) |
+ # "//ppapi:ppapi_perftests", # TODO(GYP) |
+ # "//ppapi:ppapi_unittests", # TODO(GYP) |
+ # "//remoting:remoting_unittests", # TODO(GYP) |
+ # "//remoting/host", # TODO(GYP) |
+ # "//sandbox/linux:sandbox_linux_jni_unittests", # TODO(GYP) |
+ # "//third_party/codesighs.gyp:codesighs", # TODO(GYP) |
+ # "//third_party/codesighs.gyp:nm2tsv", # TODO(GYP) |
+ # "//tools/telemetry:bitmaptools", # TODO(GYP) |
+ # various ppapi examples, # TODO(GYP) |
+ |
+ ] |
+} |
+ |
+group("gn_all") { |
+ testonly = true |
+ |
+ deps = [ |
+ "//ash:ash_shell", |
+ "//ash:ash_shell_unittests", |
+ "//ash:ash_unittests", |
+ "//base:base_i18n_perftests", |
+ "//base:base_unittests", |
+ "//breakpad:breakpad_unittests", |
+ "//breakpad:dump_syms", |
+ "//breakpad:generate_test_dump", |
+ "//breakpad:microdump_stackwalk", |
+ "//breakpad:minidump_dump", |
+ "//breakpad:minidump_stackwalk", |
+ "//breakpad:symupload", |
+ "//cc/blink:cc_blink_unittests", |
+ "//cc:cc_perftests", |
+ "//cc:cc_unittests", |
+ "//chrome", |
+ "//chrome/test:browser_tests", |
+ "//chrome/test:interactive_ui_tests", |
+ "//chrome/test:sync_integration_tests", |
+ "//chrome/test:sync_performance_tests", |
+ "//chrome/test:unit_tests", |
+ "//chrome/test/perf", |
+ "//chrome/tools/profile_reset:jtl_compiler", |
+ "//components:components_unittests", |
+ "//components/nacl:nacl_loader_unittests", |
+ "//content/shell:content_shell", |
+ "//content/test:content_browsertests", |
+ "//content/test:content_perftests", |
+ "//content/test:content_unittests", |
+ "//courgette:courgette_minimal_tool", |
+ "//courgette:courgette_unittests", |
+ "//crypto:crypto_unittests", |
+ "//device:device_unittests", |
+ "//extensions:extensions_browsertests", |
+ "//extensions:extensions_unittests", |
+ "//extensions/shell:app_shell", |
+ "//gin:gin_unittests", |
+ "//google_apis:google_apis_unittests", |
+ "//google_apis/gcm:gcm_unit_tests", |
+ "//gpu:angle_unittests", |
+ "//gpu:gpu_unittests", |
+ "//ipc:ipc_perftests", |
+ "//ipc:ipc_tests", |
+ "//ipc/mojo:ipc_mojo_unittests", |
+ "//jingle:jingle_unittests", |
+ "//media:ffmpeg_regression_tests", |
+ "//media:media_perftests", |
+ "//media:media_unittests", |
+ "//media:player_x11", |
+ "//media/mojo", |
+ "//media/cast:cast_unittests", |
+ "//mojo", |
+ "//mojo/common:mojo_common_unittests", |
+ "//mojo/services/html_viewer:tests", |
+ "//mojo/nacl:monacl_shell", |
+ "//net:dump_cache", |
+ "//net:flip_in_mem_edsm_server_unittests", |
+ "//net:get_server_time", |
+ "//net:net_unittests", |
+ "//printing:printing_unittests", |
+ |
+ "//sql:sql_unittests", |
+ "//sync:sync_unit_tests", |
+ |
+ # TODO(GYP): the Blink test targets should be public, but |
+ # currently aren't. all_blink pulls them in, though. |
+ # "//third_party/WebKit/Source/platform:heap_unittests", |
+ # "//third_party/WebKit/Source/platform:platform_unittests", |
+ # "//third_party/WebKit/Source/wtf:wtf_unittests", |
+ "//third_party/WebKit/public:all_blink", |
+ "//third_party/cacheinvalidation:cacheinvalidation_unittests", |
+ |
+ # TODO(GYP): This is needed only w/ cld_version==1. What configs set that? |
+ "//third_party/cld", |
+ |
+ # TODO(GYP): This is needed only w/ use_system_fontconfig==0. What configs set that? |
+ "//third_party/fontconfig", |
+ |
+ "//third_party/libaddressinput:libaddressinput_unittests", |
+ "//third_party/libphonenumber:libphonenumber_unittests", |
+ "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests", |
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests", |
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests", |
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", |
+ "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests", |
+ "//third_party/pdfium/samples:pdfium_test", |
+ |
+ # TODO(GYP): Verify that this is no longer needed. |
+ "//third_party/smhasher:pmurhash", |
+ |
+ "//third_party/sqlite:sqlite_shell", |
+ "//tools/imagediff", |
+ "//tools/gn", |
+ "//tools/gn:generate_test_gn_data", |
+ "//tools/gn:gn_unittests", |
+ "//ui/accessibility:accessibility_unittests", |
+ "//ui/app_list:app_list_unittests", |
+ "//ui/aura:bench", |
+ "//ui/aura:demo", |
+ "//ui/aura:aura_unittests", |
+ "//ui/base:ui_base_unittests", |
+ "//ui/compositor:compositor_unittests", |
+ "//ui/display:display_unittests", |
+ "//ui/events:events_unittests", |
+ "//ui/gfx:gfx_unittests", |
+ "//ui/keyboard:keyboard_unittests", |
+ "//ui/snapshot:snapshot_unittests", |
+ "//ui/touch_selection:ui_touch_selection_unittests", |
+ "//ui/views:views_unittests", |
+ "//ui/wm:wm_unittests", |
+ "//url:url_unittests", |
+ "//skia:skia_unittests", |
+ ] |
+ |
+ if (is_android) { |
+ deps += [ |
+ "//chrome:chrome_shell_apk", |
+ "//content/shell/android:content_shell_apk", |
+ ] |
+ deps -= [ "//url:url_unittests" ] |
+ } else if (is_linux) { |
+ deps += [ |
+ "//dbus:dbus_unittests", |
+ "//sandbox/linux:chrome_sandbox", |
+ "//sandbox/linux:sandbox_linux_unittests", |
+ ] |
+ } |
+} |