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

Unified Diff: build/gn_migration.gypi

Issue 1939683002: Test X11 header pollution (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « build/all.gyp ('k') | content/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gn_migration.gypi
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 8fa60324785211521f3253759f71729865630827..3f3358d3893b350c777da7e56733c8db20746424 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -230,7 +230,6 @@
'../content/content_shell_and_tests.gyp:content_shell_apk',
'../content/content_shell_and_tests.gyp:content_shell_test_apk',
'../content/content_shell_and_tests.gyp:content_unittests_apk',
- '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk',
'../device/device_tests.gyp:device_unittests_apk',
'../gpu/gpu.gyp:command_buffer_gles2_tests_apk',
'../gpu/gpu.gyp:gl_tests_apk',
@@ -240,6 +239,7 @@
'../media/cast/cast.gyp:cast_unittests_apk',
'../media/media.gyp:media_perftests_apk',
'../media/media.gyp:media_unittests_apk',
+ '../media/media.gyp:video_decode_accelerator_unittest_apk',
'../media/midi/midi.gyp:midi_unittests_apk',
'../net/net.gyp:net_junit_tests',
'../net/net.gyp:net_unittests_apk',
@@ -682,22 +682,22 @@
}],
['chromeos==1', {
'dependencies': [
- '../content/content_shell_and_tests.gyp:jpeg_decode_accelerator_unittest',
+ '../media/media.gyp:jpeg_decode_accelerator_unittest',
],
}],
['chromeos==1 or OS=="mac"', {
'dependencies': [
- '../content/content_shell_and_tests.gyp:video_encode_accelerator_unittest',
+ '../media/media.gyp:video_encode_accelerator_unittest',
],
}],
['chromeos==1 and target_arch != "arm"', {
'dependencies': [
- '../content/content_shell_and_tests.gyp:vaapi_jpeg_decoder_unittest',
+ '../media/media.gyp:vaapi_jpeg_decoder_unittest',
],
}],
['chromeos==1 or OS=="win" or OS=="android"', {
'dependencies': [
- '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest',
+ '../media/media.gyp:video_decode_accelerator_unittest',
],
}],
['OS=="linux" or OS=="win"', {
« no previous file with comments | « build/all.gyp ('k') | content/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698