diff options
| author | miu <miu@chromium.org> | 2015-11-25 17:23:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-26 01:24:17 +0000 |
| commit | 45b848fe18655d1836d08b5f024899cdaa0b33db (patch) | |
| tree | 7f89f03b8b8c7745136aa221e094fe8a9a7ccc02 /build/gn_migration.gypi | |
| parent | 51d2f0c733b47605d75cfe5b4e94832f9a5dcd85 (diff) | |
| download | chromium_src-45b848fe18655d1836d08b5f024899cdaa0b33db.zip chromium_src-45b848fe18655d1836d08b5f024899cdaa0b33db.tar.gz chromium_src-45b848fe18655d1836d08b5f024899cdaa0b33db.tar.bz2 | |
media/cast: Get cast_unittests building on Android
1. Re-sync'ed GYP and GN build files, consolidating duplicated items to
appear once in common targets. Aside from aesthetics, this resolved
some link issues for Android.
2. Factored the cast testing tools into a separate GYPI to make it clear
they were being built for the desktop platforms only, and to make things
more manageable for the future.
3. Tweaks to enable generation of cast_unittests_apk and its successful
run on Android.
Testing notes: Generated build files using both GYP and GN, built and
ran cast_unittests on Linux, and built and ran cast_unittests_apk on
Android x86. Also, trybot runs in one patch set have sanity-checked the
same on other platforms/architectures.
BUG=558714
Review URL: https://codereview.chromium.org/1473143002
Cr-Commit-Position: refs/heads/master@{#361783}
Diffstat (limited to 'build/gn_migration.gypi')
| -rw-r--r-- | build/gn_migration.gypi | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index cf7fa7b..6f9a8ea 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -67,6 +67,7 @@ '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests', + '../media/cast/cast.gyp:cast_unittests', '../media/media.gyp:media_perftests', '../media/media.gyp:media_unittests', '../media/midi/midi.gyp:midi_unittests', @@ -201,6 +202,7 @@ '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk', '../device/device_tests.gyp:device_unittests_apk', '../gpu/gpu.gyp:gpu_unittests_apk', + '../media/cast/cast.gyp:cast_unittests_apk', '../media/media.gyp:media_unittests_apk', '../media/midi/midi.gyp:midi_unittests_apk', '../net/net.gyp:net_junit_tests', @@ -282,10 +284,6 @@ '../google_apis/gcm/gcm.gyp:mcs_probe', '../google_apis/google_apis.gyp:google_apis_unittests', '../jingle/jingle.gyp:jingle_unittests', - '../media/cast/cast.gyp:cast_benchmarks', - '../media/cast/cast.gyp:cast_unittests', - '../media/cast/cast.gyp:generate_barcode_video', - '../media/cast/cast.gyp:generate_timecode_audio', '../mojo/mojo.gyp:mojo', '../net/net.gyp:crash_cache', '../net/net.gyp:crl_set_dump', @@ -426,6 +424,7 @@ 'dependencies': [ '../dbus/dbus.gyp:dbus_test_server', '../dbus/dbus.gyp:dbus_unittests', + '../media/cast/cast.gyp:cast_testing_tools', '../media/cast/cast.gyp:tap_proxy', '../net/net.gyp:disk_cache_memory_test', '../net/net.gyp:flip_in_mem_edsm_server', |