Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/all.gyp

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/win/message_window.cc ('k') | build/android/adb_android_webview_command_line » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 48370974cad76d9588387b868a893b315dff95e9..6b8ad831a43558a5bdd8c6a3c451dd0c5f9ed434 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -87,6 +87,7 @@
'../android_webview/android_webview.gyp:system_webview_apk',
'../android_webview/android_webview_shell.gyp:android_webview_shell_apk',
'../android_webview/android_webview_telemetry_shell.gyp:android_webview_telemetry_shell_apk',
+ '../chrome/android/chrome_apk.gyp:chrome_public_apk',
'../chrome/chrome.gyp:chrome_shell_apk',
'../chrome/chrome.gyp:chrome_sync_shell_apk',
'../remoting/remoting.gyp:remoting_apk',
@@ -94,8 +95,8 @@
}],
['target_arch == "arm" or target_arch == "arm64"', {
'dependencies': [
- # The relocation packer only works on ARM or ARM64.
- '../tools/relocation_packer/relocation_packer.gyp:relocation_packer_unittests#host',
+ # The relocation packer is currently used only for ARM or ARM64.
+ '../third_party/android_platform/relocation_packer.gyp:android_relocation_packer_unittests#host',
],
}],
],
@@ -376,8 +377,6 @@
}],
['OS=="win"', {
'dependencies': [
- '../chrome/chrome.gyp:app_installer',
- '../chrome/chrome.gyp:app_installer_unittests',
'../chrome/chrome.gyp:crash_service',
'../chrome/chrome.gyp:installer_util_unittests',
# ../chrome/test/mini_installer requires mini_installer.
@@ -489,6 +488,11 @@
'../components/nacl.gyp:nacl_loader_unittests',
],
}],
+ ['disable_nacl==0 and disable_nacl_untrusted==0 and enable_nacl_nonsfi_test==1', {
+ 'dependencies': [
+ '../components/nacl.gyp:nacl_helper_nonsfi_unittests',
+ ],
+ }],
['disable_nacl==0 and disable_nacl_untrusted==0', {
'dependencies': [
'../mojo/mojo_nacl_untrusted.gyp:libmojo',
@@ -529,8 +533,8 @@
}],
['OS=="win"', {
'dependencies': [
+ '../components/test_runner/test_runner.gyp:layout_test_helper',
'../content/content_shell_and_tests.gyp:content_shell_crash_service',
- '../content/content_shell_and_tests.gyp:layout_test_helper',
],
}],
['OS!="win" and OS!="android"', {
@@ -540,8 +544,8 @@
}],
['OS=="mac"', {
'dependencies': [
+ '../components/test_runner/test_runner.gyp:layout_test_helper',
'../breakpad/breakpad.gyp:dump_syms#host',
- '../content/content_shell_and_tests.gyp:layout_test_helper',
],
}],
['OS=="linux"', {
@@ -876,6 +880,7 @@
# Unit test bundles packaged as an apk.
'../android_webview/android_webview.gyp:android_webview_test_apk',
'../android_webview/android_webview.gyp:android_webview_unittests_apk',
+ '../chrome/android/chrome_apk.gyp:chrome_public_test_apk',
'../chrome/chrome.gyp:chrome_junit_tests',
'../chrome/chrome.gyp:chrome_shell_test_apk',
'../chrome/chrome.gyp:chrome_sync_shell_test_apk',
@@ -884,11 +889,6 @@
'../chrome/chrome.gyp:unit_tests_apk',
],
}],
- ['enable_webrtc==1 and "<(libpeer_target_type)"=="static_library"', {
- 'dependencies': [
- '../components/devtools_bridge.gyp:devtools_bridge_tests_apk',
- ],
- }],
],
},
{
@@ -900,8 +900,6 @@
'../content/content_shell_and_tests.gyp:content_browsertests',
'../tools/android/android_tools.gyp:android_tools',
'../tools/android/android_tools.gyp:memconsumer',
- # Unit test bundles packaged as an apk.
- '../components/devtools_bridge.gyp:devtools_bridge_tests_apk',
'../content/content_shell_and_tests.gyp:content_browsertests_apk',
],
}, # target_name: android_builder_chromium_webrtc
@@ -1146,9 +1144,9 @@
'target_name': 'chromium_builder_lkgr_drmemory_win',
'type': 'none',
'dependencies': [
+ '../components/test_runner/test_runner.gyp:layout_test_helper',
'../content/content_shell_and_tests.gyp:content_shell',
'../content/content_shell_and_tests.gyp:content_shell_crash_service',
- '../content/content_shell_and_tests.gyp:layout_test_helper',
],
},
{
@@ -1168,10 +1166,10 @@
'../chrome_elf/chrome_elf.gyp:chrome_elf_unittests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components_tests.gyp:components_unittests',
+ '../components/test_runner/test_runner.gyp:layout_test_helper',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_shell',
'../content/content_shell_and_tests.gyp:content_shell_crash_service',
- '../content/content_shell_and_tests.gyp:layout_test_helper',
'../content/content_shell_and_tests.gyp:content_unittests',
'../courgette/courgette.gyp:courgette_unittests',
'../crypto/crypto.gyp:crypto_unittests',
@@ -1224,7 +1222,6 @@
'target_name': 'chrome_official_builder_no_unittests',
'type': 'none',
'dependencies': [
- '../chrome/chrome.gyp:app_installer',
'../chrome/chrome.gyp:crash_service',
'../chrome/chrome.gyp:gcapi_dll',
'../chrome/chrome.gyp:pack_policy_templates',
@@ -1252,15 +1249,14 @@
'target_name': 'chrome_official_builder',
'type': 'none',
'dependencies': [
- 'chrome_official_builder_no_unittests',
+ 'chrome_official_builder_no_unittests',
'../base/base.gyp:base_unittests',
- '../chrome/chrome.gyp:app_installer_unittests',
'../chrome/chrome.gyp:browser_tests',
'../chrome/chrome.gyp:sync_integration_tests',
'../ipc/ipc.gyp:ipc_tests',
'../media/media.gyp:media_unittests',
'../media/midi/midi.gyp:midi_unittests',
- '../net/net.gyp:net_unittests_run',
+ '../net/net.gyp:net_unittests',
'../printing/printing.gyp:printing_unittests',
'../sql/sql.gyp:sql_unittests',
'../sync/sync.gyp:sync_unit_tests',
« no previous file with comments | « base/win/message_window.cc ('k') | build/android/adb_android_webview_command_line » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698