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

Side by Side Diff: content/content_tests.gypi

Issue 1314823003: Make Linker.isUsed() static, and clean up the fallout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tiny log tweak, protected->private, rebase to master. 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
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 1936 matching lines...) Expand 10 before | Expand all | Expand 10 after
1947 'jinja_inputs': ['shell/android/linker_test_apk/AndroidManifest.xml. jinja2'], 1947 'jinja_inputs': ['shell/android/linker_test_apk/AndroidManifest.xml. jinja2'],
1948 'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/chromium_linker_test_man ifest/AndroidManifest.xml', 1948 'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/chromium_linker_test_man ifest/AndroidManifest.xml',
1949 }, 1949 },
1950 'includes': [ '../build/android/jinja_template.gypi' ], 1950 'includes': [ '../build/android/jinja_template.gypi' ],
1951 }, 1951 },
1952 { 1952 {
1953 # GN: //content/shell/android:chromium_linker_test_apk 1953 # GN: //content/shell/android:chromium_linker_test_apk
1954 'target_name': 'chromium_linker_test_apk', 1954 'target_name': 'chromium_linker_test_apk',
1955 'type': 'none', 1955 'type': 'none',
1956 'conditions': [ 1956 'conditions': [
1957 ['target_arch != "x64" and target_arch != "arm64"', { 1957 ['target_arch != "x64"', {
1958 'dependencies': [ 1958 'dependencies': [
1959 'chromium_android_linker_test', 1959 'chromium_android_linker_test',
1960 'content.gyp:content_icudata', 1960 'content.gyp:content_icudata',
1961 'content.gyp:content_java', 1961 'content.gyp:content_java',
1962 'content.gyp:content_v8_external_data', 1962 'content.gyp:content_v8_external_data',
1963 'content_shell_java', 1963 'content_shell_java',
1964 ], 1964 ],
1965 'variables': { 1965 'variables': {
1966 'apk_name': 'ChromiumLinkerTest', 1966 'apk_name': 'ChromiumLinkerTest',
1967 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/chromium_li nker_test_manifest/AndroidManifest.xml', 1967 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/chromium_li nker_test_manifest/AndroidManifest.xml',
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
2112 ], 2112 ],
2113 }, 2113 },
2114 'includes': [ 2114 'includes': [
2115 '../build/host_jar.gypi', 2115 '../build/host_jar.gypi',
2116 ], 2116 ],
2117 }, 2117 },
2118 ], 2118 ],
2119 }], 2119 }],
2120 ], 2120 ],
2121 } 2121 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698