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

Side by Side Diff: content/content_tests.gypi

Issue 1318143002: Always use ENABLE_PLUGINS to indicate plugins support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tryjob failures: forgot to set/check ENABLE_PDF in a couple places. Created 5 years, 3 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
« no previous file with comments | « content/content_browsertests.isolate ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1904 matching lines...) Expand 10 before | Expand all | Expand 10 after
1915 'additional_input_paths': [ 1915 'additional_input_paths': [
1916 '<(PRODUCT_DIR)/icudtl.dat', 1916 '<(PRODUCT_DIR)/icudtl.dat',
1917 ], 1917 ],
1918 }], 1918 }],
1919 ['v8_use_external_startup_data==1', { 1919 ['v8_use_external_startup_data==1', {
1920 'additional_input_paths': [ 1920 'additional_input_paths': [
1921 '<(PRODUCT_DIR)/natives_blob.bin', 1921 '<(PRODUCT_DIR)/natives_blob.bin',
1922 '<(PRODUCT_DIR)/snapshot_blob.bin', 1922 '<(PRODUCT_DIR)/snapshot_blob.bin',
1923 ], 1923 ],
1924 }], 1924 }],
1925 ['enable_plugins==1', {
1926 'additional_bundled_libs': [
1927 '<(PRODUCT_DIR)/libppapi_tests.so',
1928 ],
1929 }],
1925 ], 1930 ],
1926 }, 1931 },
1927 'includes': [ '../build/apk_browsertest.gypi' ], 1932 'includes': [ '../build/apk_browsertest.gypi' ],
1928 }, 1933 },
1929 { 1934 {
1930 # TODO(GN) 1935 # TODO(GN)
1931 'target_name': 'content_perftests_apk', 1936 'target_name': 'content_perftests_apk',
1932 'type': 'none', 1937 'type': 'none',
1933 'dependencies': [ 1938 'dependencies': [
1934 'content.gyp:content_java', 1939 'content.gyp:content_java',
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
2112 ], 2117 ],
2113 }, 2118 },
2114 'includes': [ 2119 'includes': [
2115 '../build/host_jar.gypi', 2120 '../build/host_jar.gypi',
2116 ], 2121 ],
2117 }, 2122 },
2118 ], 2123 ],
2119 }], 2124 }],
2120 ], 2125 ],
2121 } 2126 }
OLDNEW
« no previous file with comments | « content/content_browsertests.isolate ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698