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

Side by Side Diff: content/content_tests.gypi

Issue 1882373004: Migrate content/common/gpu/media code to media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix several more bot-identified build issues 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 { 5 {
6 'variables': { 6 'variables': {
7 'layouttest_support_content_sources': [ 7 'layouttest_support_content_sources': [
8 'public/test/layouttest_support.h', 8 'public/test/layouttest_support.h',
9 'public/test/nested_message_pump_android.cc', 9 'public/test/nested_message_pump_android.cc',
10 'public/test/nested_message_pump_android.h', 10 'public/test/nested_message_pump_android.h',
(...skipping 1638 matching lines...) Expand 10 before | Expand all | Expand 10 after
1649 '../build/isolate.gypi', 1649 '../build/isolate.gypi',
1650 ], 1650 ],
1651 'sources': [ 1651 'sources': [
1652 'content_gl_tests.isolate', 1652 'content_gl_tests.isolate',
1653 ], 1653 ],
1654 }, 1654 },
1655 ], 1655 ],
1656 }], 1656 }],
1657 ], 1657 ],
1658 }], 1658 }],
1659 ['chromeos==1 or OS=="win" or OS=="android"', {
1660 'targets': [
1661 {
1662 # TODO(GYP): Port Windows and ChromeOS logic.
1663 # GN: //content/test:video_decode_accelerator_unittest
1664 'target_name': 'video_decode_accelerator_unittest',
1665 'type': '<(gtest_target_type)',
1666 'dependencies': [
1667 '../base/base.gyp:base',
1668 '../gpu/gpu.gyp:command_buffer_service',
1669 '../media/media.gyp:media',
1670 '../testing/gtest.gyp:gtest',
1671 '../ui/base/ui_base.gyp:ui_base',
1672 '../ui/gfx/gfx.gyp:gfx',
1673 '../ui/gfx/gfx.gyp:gfx_geometry',
1674 '../ui/gfx/gfx.gyp:gfx_test_support',
1675 '../ui/gl/gl.gyp:gl',
1676 '../ui/gl/gl.gyp:gl_test_support',
1677 'content.gyp:content',
1678 ],
1679 'include_dirs': [
1680 '<(DEPTH)/third_party/khronos',
1681 ],
1682 'sources': [
1683 'common/gpu/media/android_video_decode_accelerator_unittest.cc',
1684 'common/gpu/media/rendering_helper.cc',
1685 'common/gpu/media/rendering_helper.h',
1686 'common/gpu/media/video_accelerator_unittest_helpers.h',
1687 'common/gpu/media/video_decode_accelerator_unittest.cc',
1688 ],
1689 'conditions': [
1690 ['OS=="android"', {
1691 'sources/': [
1692 ['exclude', '^common/gpu/media/rendering_helper.h'],
1693 ['exclude', '^common/gpu/media/rendering_helper.cc'],
1694 ['exclude', '^common/gpu/media/video_decode_accelerator_unitte st.cc'],
1695 ],
1696 'dependencies': [
1697 '../media/media.gyp:player_android',
1698 '../testing/gmock.gyp:gmock',
1699 '../testing/android/native_test.gyp:native_test_native_code',
1700 '../gpu/gpu.gyp:gpu_unittest_utils',
1701 ],
1702 }, { # OS!="android"
1703 'sources/': [
1704 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'],
1705 ],
1706 }],
1707 ['OS=="win"', {
1708 'dependencies': [
1709 '<(angle_path)/src/angle.gyp:libEGL',
1710 '<(angle_path)/src/angle.gyp:libGLESv2',
1711 ],
1712 }],
1713 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
1714 'include_dirs': [
1715 '<(DEPTH)/third_party/libva',
1716 ],
1717 }],
1718 ['use_x11==1', {
1719 'dependencies': [
1720 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c
1721 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
1722 ],
1723 }],
1724 ['use_ozone==1 and chromeos==1', {
1725 'dependencies': [
1726 '../ui/display/display.gyp:display', # Used by rendering_help er.cc
1727 '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helper.cc
1728 ],
1729 }],
1730 ],
1731 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1732 'msvs_disabled_warnings': [ 4267, ],
1733 },
1734 ]
1735 }],
1736 ['chromeos==1 and target_arch != "arm"', {
1737 'targets': [
1738 {
1739 'target_name': 'vaapi_jpeg_decoder_unittest',
1740 'type': '<(gtest_target_type)',
1741 'dependencies': [
1742 'content.gyp:content_common',
1743 '../base/base.gyp:base',
1744 '../media/media.gyp:media',
1745 '../media/media.gyp:media_test_support',
1746 '../testing/gtest.gyp:gtest',
1747 ],
1748 'sources': [
1749 'common/gpu/media/vaapi_jpeg_decoder_unittest.cc',
1750 ],
1751 'include_dirs': [
1752 '<(DEPTH)/third_party/libva',
1753 ],
1754 'conditions': [
1755 ['use_x11==1', {
1756 'dependencies': [
1757 '../build/linux/system.gyp:x11',
1758 ]
1759 }, {
1760 'dependencies': [
1761 '../build/linux/system.gyp:libdrm',
1762 ]
1763 }],
1764 ],
1765 }
1766 ]
1767 }],
1768 ['chromeos==1 or OS=="mac"', {
1769 'targets': [
1770 {
1771 'target_name': 'video_encode_accelerator_unittest',
1772 'type': 'executable',
1773 'dependencies': [
1774 'content.gyp:content_common',
1775 '../base/base.gyp:base',
1776 '../media/media.gyp:media',
1777 '../media/media.gyp:media_test_support',
1778 '../testing/gtest.gyp:gtest',
1779 '../ui/base/ui_base.gyp:ui_base',
1780 '../ui/gfx/gfx.gyp:gfx',
1781 '../ui/gfx/gfx.gyp:gfx_geometry',
1782 '../ui/gfx/gfx.gyp:gfx_test_support',
1783 '../ui/gl/gl.gyp:gl',
1784 '../ui/gl/gl.gyp:gl_test_support',
1785 'content.gyp:content',
1786 ],
1787 'sources': [
1788 'common/gpu/media/video_accelerator_unittest_helpers.h',
1789 'common/gpu/media/video_encode_accelerator_unittest.cc',
1790 ],
1791 'include_dirs': [
1792 '<(DEPTH)/third_party/libva',
1793 '<(DEPTH)/third_party/libyuv',
1794 ],
1795 'conditions': [
1796 ['use_x11==1', {
1797 'dependencies': [
1798 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
1799 ],
1800 }],
1801 ['use_ozone==1', {
1802 'dependencies': [
1803 '../ui/ozone/ozone.gyp:ozone',
1804 ],
1805 }],
1806 ],
1807 }
1808 ]
1809 }],
1810 ['chromeos==1', {
1811 'targets': [
1812 {
1813 'target_name': 'jpeg_decode_accelerator_unittest',
1814 'type': 'executable',
1815 'dependencies': [
1816 '../base/base.gyp:base',
1817 '../media/media.gyp:media',
1818 '../media/media.gyp:media_test_support',
1819 '../testing/gtest.gyp:gtest',
1820 '../third_party/libyuv/libyuv.gyp:libyuv',
1821 '../ui/gfx/gfx.gyp:gfx',
1822 '../ui/gfx/gfx.gyp:gfx_geometry',
1823 '../ui/gl/gl.gyp:gl',
1824 '../ui/gl/gl.gyp:gl_test_support',
1825 'content.gyp:content',
1826 ],
1827 'sources': [
1828 'common/gpu/media/jpeg_decode_accelerator_unittest.cc',
1829 ],
1830 'include_dirs': [
1831 '<(DEPTH)/third_party/libva',
1832 '<(DEPTH)/third_party/libyuv',
1833 ],
1834 }
1835 ]
1836 }],
1837 ['OS == "android"', { 1659 ['OS == "android"', {
1838 'targets': [ 1660 'targets': [
1839 { 1661 {
1840 # GN: //content/test:content_gl_tests 1662 # GN: //content/test:content_gl_tests
1841 'target_name': 'content_gl_tests_apk', 1663 'target_name': 'content_gl_tests_apk',
1842 'type': 'none', 1664 'type': 'none',
1843 'dependencies': [ 1665 'dependencies': [
1844 'content_gl_tests', 1666 'content_gl_tests',
1845 'content_java_test_support', 1667 'content_java_test_support',
1846 ], 1668 ],
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
2052 'type': 'none', 1874 'type': 'none',
2053 'sources': [ 1875 'sources': [
2054 'shell/android/linker_test_apk/src/org/chromium/chromium_linker_test _apk/LinkerTests.java', 1876 'shell/android/linker_test_apk/src/org/chromium/chromium_linker_test _apk/LinkerTests.java',
2055 ], 1877 ],
2056 'variables': { 1878 'variables': {
2057 'jni_gen_package': 'content/shell', 1879 'jni_gen_package': 'content/shell',
2058 }, 1880 },
2059 'includes': [ '../build/jni_generator.gypi' ], 1881 'includes': [ '../build/jni_generator.gypi' ],
2060 }, 1882 },
2061 { 1883 {
2062 # GN: //content/test:video_decode_accelerator_unittest_apk
2063 'target_name': 'video_decode_accelerator_unittest_apk',
2064 'type': 'none',
2065 'dependencies': [
2066 'video_decode_accelerator_unittest',
2067 ],
2068 'variables': {
2069 'test_suite_name': 'video_decode_accelerator_unittest',
2070 },
2071 'includes': [ '../build/apk_test.gypi' ],
2072 },
2073 {
2074 # GN: //content/public/test/android:test_support_content_jni_headers 1884 # GN: //content/public/test/android:test_support_content_jni_headers
2075 'target_name': 'test_support_content_jni_headers', 1885 'target_name': 'test_support_content_jni_headers',
2076 'type': 'none', 1886 'type': 'none',
2077 'sources': [ 1887 'sources': [
2078 'public/test/android/javatests/src/org/chromium/content/browser/test /NestedSystemMessageHandler.java', 1888 'public/test/android/javatests/src/org/chromium/content/browser/test /NestedSystemMessageHandler.java',
2079 ], 1889 ],
2080 'variables': { 1890 'variables': {
2081 'jni_gen_package': 'content/public/test', 1891 'jni_gen_package': 'content/public/test',
2082 }, 1892 },
2083 'includes': [ '../build/jni_generator.gypi' ], 1893 'includes': [ '../build/jni_generator.gypi' ],
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
2199 'content_unittests_apk.isolate', 2009 'content_unittests_apk.isolate',
2200 ], 2010 ],
2201 }, 2011 },
2202 ], 2012 ],
2203 }, 2013 },
2204 ], 2014 ],
2205 ], 2015 ],
2206 }], 2016 }],
2207 ], 2017 ],
2208 } 2018 }
OLDNEW
« no previous file with comments | « content/content_gpu.gypi ('k') | content/gpu/BUILD.gn » ('j') | media/gpu/h264_decoder.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698