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

Side by Side Diff: components/components_tests.gyp

Issue 1447823003: Revert of Implemented clearing Java prefs after pulling variations first run seed from Java to C++ side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | components/variations/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # This turns on e.g. the filename-based detection of which 7 # This turns on e.g. the filename-based detection of which
8 # platforms to include source files on (e.g. files ending in 8 # platforms to include source files on (e.g. files ending in
9 # _mac.h or _mac.cc are only compiled on MacOSX). 9 # _mac.h or _mac.cc are only compiled on MacOSX).
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 'scheduler/scheduler.gyp:scheduler', 1178 'scheduler/scheduler.gyp:scheduler',
1179 'test_runner/test_runner.gyp:test_runner', 1179 'test_runner/test_runner.gyp:test_runner',
1180 'tracing.gyp:tracing', 1180 'tracing.gyp:tracing',
1181 'webcrypto/webcrypto.gyp:webcrypto', 1181 'webcrypto/webcrypto.gyp:webcrypto',
1182 '../third_party/re2/re2.gyp:re2', 1182 '../third_party/re2/re2.gyp:re2',
1183 ], 1183 ],
1184 'conditions': [ 1184 'conditions': [
1185 ['OS=="android"', { 1185 ['OS=="android"', {
1186 'dependencies': [ 1186 'dependencies': [
1187 '../build/android/ndk.gyp:cpu_features', 1187 '../build/android/ndk.gyp:cpu_features',
1188 'components.gyp:variations_java',
1189 'components.gyp:variations_jni_headers',
1190 ], 1188 ],
1191 }], 1189 }],
1192 ['OS=="android" and configuration_policy == 1', { 1190 ['OS=="android" and configuration_policy == 1', {
1193 'dependencies': [ 1191 'dependencies': [
1194 'components.gyp:policy_java', 1192 'components.gyp:policy_java',
1195 ], 1193 ],
1196 }], 1194 }],
1197 ['use_openssl==1', { 1195 ['use_openssl==1', {
1198 'dependencies': [ 1196 'dependencies': [
1199 '../third_party/boringssl/boringssl.gyp:boringssl', 1197 '../third_party/boringssl/boringssl.gyp:boringssl',
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
1822 'dependencies': [ 1820 'dependencies': [
1823 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1821 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1824 ], 1822 ],
1825 }], 1823 }],
1826 ], 1824 ],
1827 }, 1825 },
1828 ], 1826 ],
1829 }], 1827 }],
1830 ], 1828 ],
1831 } 1829 }
OLDNEW
« no previous file with comments | « no previous file | components/variations/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698