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

Side by Side Diff: net/net.gyp

Issue 10399126: Add APK targets for content_unittests and net_unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 'target_conditions': [ 1023 'target_conditions': [
1024 ['OS == "android"', { 1024 ['OS == "android"', {
1025 'sources/': [ 1025 'sources/': [
1026 ['include', '^base/platform_mime_util_linux\\.cc$'], 1026 ['include', '^base/platform_mime_util_linux\\.cc$'],
1027 ], 1027 ],
1028 }], 1028 }],
1029 ], 1029 ],
1030 }, 1030 },
1031 { 1031 {
1032 'target_name': 'net_unittests', 1032 'target_name': 'net_unittests',
1033 'type': 'executable', 1033 'type': '<(gtest_target_type)',
1034 'dependencies': [ 1034 'dependencies': [
1035 'net', 1035 'net',
1036 'net_test_support', 1036 'net_test_support',
1037 '../base/base.gyp:base', 1037 '../base/base.gyp:base',
1038 '../base/base.gyp:base_i18n', 1038 '../base/base.gyp:base_i18n',
1039 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 1039 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
1040 '../build/temp_gyp/googleurl.gyp:googleurl', 1040 '../build/temp_gyp/googleurl.gyp:googleurl',
1041 '../crypto/crypto.gyp:crypto', 1041 '../crypto/crypto.gyp:crypto',
1042 '../testing/gmock.gyp:gmock', 1042 '../testing/gmock.gyp:gmock',
1043 '../testing/gtest.gyp:gtest', 1043 '../testing/gtest.gyp:gtest',
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 ], 1360 ],
1361 [ 'OS == "android"', { 1361 [ 'OS == "android"', {
1362 'dependencies': [ 1362 'dependencies': [
1363 '../third_party/openssl/openssl.gyp:openssl', 1363 '../third_party/openssl/openssl.gyp:openssl',
1364 ], 1364 ],
1365 'sources!': [ 1365 'sources!': [
1366 'dns/dns_config_service_posix_unittest.cc', 1366 'dns/dns_config_service_posix_unittest.cc',
1367 ], 1367 ],
1368 }, 1368 },
1369 ], 1369 ],
1370 ['OS=="android" and "<(gtest_target_type)"=="shared_library"', {
1371 'dependencies': [
1372 '../testing/android/native_test.gyp:native_test_native_code',
1373 ]
1374 }],
1370 [ 'OS != "win" and OS != "mac"', { 1375 [ 'OS != "win" and OS != "mac"', {
1371 'sources!': [ 1376 'sources!': [
1372 'base/x509_cert_types_unittest.cc', 1377 'base/x509_cert_types_unittest.cc',
1373 ], 1378 ],
1374 }] 1379 }]
1375 ], 1380 ],
1376 }, 1381 },
1377 { 1382 {
1378 'target_name': 'net_unittests_run', 1383 'target_name': 'net_unittests_run',
1379 'type': 'none', 1384 'type': 'none',
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
1833 'package_name': 'net', 1838 'package_name': 'net',
1834 'java_in_dir': '../net/android/java', 1839 'java_in_dir': '../net/android/java',
1835 }, 1840 },
1836 'dependencies': [ 1841 'dependencies': [
1837 '../base/base.gyp:base_java', 1842 '../base/base.gyp:base_java',
1838 ], 1843 ],
1839 'includes': [ '../build/java.gypi' ], 1844 'includes': [ '../build/java.gypi' ],
1840 }, 1845 },
1841 ], 1846 ],
1842 }], 1847 }],
1848 # Special target to wrap a <(gtest_target_type)==shared_library
1849 # net_unittests into an android apk for execution.
Yaron 2012/05/22 17:35:55 So can we templatize these now like in build/java.
nilesh 2012/05/22 21:01:02 Done. Thanks, this is much cleaner now.
1850 # See base.gyp for TODO(jrg)s about this strategy.
1851 ['OS=="android" and "<(gtest_target_type)"=="shared_library"', {
1852 'targets': [
1853 {
1854 'target_name': 'net_unittests_apk',
1855 'type': 'none',
1856 'dependencies': [
1857 'net_unittests',
1858 ],
1859 'actions': [
1860 {
1861 # Generate apk files (including source and antfile) from
1862 # a template, and builds them.
1863 'action_name': 'generate_and_build',
1864 'inputs': [
1865 '../testing/android/AndroidManifest.xml',
1866 '../testing/android/generate_native_test.py',
1867 '<(PRODUCT_DIR)/lib.target/libnet_unittests.so',
1868 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
1869 ],
1870 'outputs': [
1871 '<(PRODUCT_DIR)/net_unittests_apk/net_unittests-debug.apk',
1872 ],
1873 'action': [
1874 '../testing/android/generate_native_test.py',
1875 '--native_library',
1876 '<(PRODUCT_DIR)/lib.target/libnet_unittests.so',
1877 '--jar',
1878 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
1879 '--output',
1880 '<(PRODUCT_DIR)/net_unittests_apk',
1881 '--ant-args',
1882 '-DPRODUCT_DIR=<(PRODUCT_DIR)',
1883 '--ant-compile'
1884 ],
1885 },
1886 ]
1887 },
1888 ],
1889 }],
1843 ['OS=="win"', { 1890 ['OS=="win"', {
1844 'targets': [ 1891 'targets': [
1845 { 1892 {
1846 # TODO(port): dump_cache is still Windows-specific. 1893 # TODO(port): dump_cache is still Windows-specific.
1847 'target_name': 'dump_cache', 1894 'target_name': 'dump_cache',
1848 'type': 'executable', 1895 'type': 'executable',
1849 'dependencies': [ 1896 'dependencies': [
1850 'net', 1897 'net',
1851 'net_test_support', 1898 'net_test_support',
1852 '../base/base.gyp:base', 1899 '../base/base.gyp:base',
1853 ], 1900 ],
1854 'sources': [ 1901 'sources': [
1855 'tools/dump_cache/cache_dumper.cc', 1902 'tools/dump_cache/cache_dumper.cc',
1856 'tools/dump_cache/cache_dumper.h', 1903 'tools/dump_cache/cache_dumper.h',
1857 'tools/dump_cache/dump_cache.cc', 1904 'tools/dump_cache/dump_cache.cc',
1858 'tools/dump_cache/dump_files.cc', 1905 'tools/dump_cache/dump_files.cc',
1859 'tools/dump_cache/upgrade.cc', 1906 'tools/dump_cache/upgrade.cc',
1860 'tools/dump_cache/url_to_filename_encoder.cc', 1907 'tools/dump_cache/url_to_filename_encoder.cc',
1861 'tools/dump_cache/url_to_filename_encoder.h', 1908 'tools/dump_cache/url_to_filename_encoder.h',
1862 'tools/dump_cache/url_utilities.h', 1909 'tools/dump_cache/url_utilities.h',
1863 'tools/dump_cache/url_utilities.cc', 1910 'tools/dump_cache/url_utilities.cc',
1864 ], 1911 ],
1865 }, 1912 },
1866 ], 1913 ],
1867 }], 1914 }],
1868 ], 1915 ],
1869 } 1916 }
OLDNEW
« build/android/gtest_filter/content_unittests_disabled ('K') | « content/content_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698