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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 1587673014: Revert of [Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « build/java_apk.gypi ('k') | chrome/test/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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'variables': { 5 'variables': {
6 'chrome_unit_tests_sources': [ 6 'chrome_unit_tests_sources': [
7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
8 # dependency is needed to make commit bots run unit_tests on 8 # dependency is needed to make commit bots run unit_tests on
9 # histograms.xml changes. 9 # histograms.xml changes.
10 '../tools/metrics/histograms/histograms.xml', 10 '../tools/metrics/histograms/histograms.xml',
(...skipping 2966 matching lines...) Expand 10 before | Expand all | Expand 10 after
2977 'type': 'none', 2977 'type': 'none',
2978 'dependencies': [ 2978 'dependencies': [
2979 'chrome_java', 2979 'chrome_java',
2980 'unit_tests_java', 2980 'unit_tests_java',
2981 'unit_tests', 2981 'unit_tests',
2982 ], 2982 ],
2983 'variables': { 2983 'variables': {
2984 'test_suite_name': 'unit_tests', 2984 'test_suite_name': 'unit_tests',
2985 'isolate_file': 'unit_tests.isolate', 2985 'isolate_file': 'unit_tests.isolate',
2986 'android_manifest_path': 'test/android/unit_tests_apk/AndroidManifes t.xml', 2986 'android_manifest_path': 'test/android/unit_tests_apk/AndroidManifes t.xml',
2987 'enable_multidex': 1,
2988 'conditions': [ 2987 'conditions': [
2989 ['v8_use_external_startup_data==1', { 2988 ['v8_use_external_startup_data==1', {
2990 'asset_location': '<(PRODUCT_DIR)/unit_tests_apk/assets', 2989 'asset_location': '<(PRODUCT_DIR)/unit_tests_apk/assets',
2991 'additional_input_paths': [ 2990 'additional_input_paths': [
2992 '<(PRODUCT_DIR)/unit_tests_apk/assets/natives_blob_<(arch_suff ix).bin', 2991 '<(PRODUCT_DIR)/unit_tests_apk/assets/natives_blob_<(arch_suff ix).bin',
2993 '<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob_<(arch_suf fix).bin', 2992 '<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob_<(arch_suf fix).bin',
2994 ], 2993 ],
2995 }], 2994 }],
2996 ], 2995 ],
2997 }, 2996 },
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
3060 'dependencies': [ 3059 'dependencies': [
3061 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3060 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3062 ], 3061 ],
3063 }], 3062 }],
3064 ], 3063 ],
3065 }, 3064 },
3066 ], 3065 ],
3067 }], 3066 }],
3068 ], # 'conditions' 3067 ], # 'conditions'
3069 } 3068 }
OLDNEW
« no previous file with comments | « build/java_apk.gypi ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698