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

Side by Side Diff: chrome/android/chrome_apk.gyp

Issue 1408163009: [Android] Enable multidex for debug builds of ChromePublic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: actually remove --tested-apk-multidex-configuration-path 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
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 'includes': [ 5 'includes': [
6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces. 6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces.
7 '../../build/util/version.gypi' 7 '../../build/util/version.gypi'
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 { 193 {
194 # GN: //chrome/android:chrome_public_apk 194 # GN: //chrome/android:chrome_public_apk
195 'target_name': 'chrome_public_apk', 195 'target_name': 'chrome_public_apk',
196 'type': 'none', 196 'type': 'none',
197 'variables': { 197 'variables': {
198 'android_manifest_path': '<(chrome_public_apk_manifest)', 198 'android_manifest_path': '<(chrome_public_apk_manifest)',
199 'apk_name': 'ChromePublic', 199 'apk_name': 'ChromePublic',
200 'native_lib_target': 'libchrome_public', 200 'native_lib_target': 'libchrome_public',
201 'java_in_dir': 'java', 201 'java_in_dir': 'java',
202 'resource_dir': '../../chrome/android/java/res_chromium', 202 'resource_dir': '../../chrome/android/java/res_chromium',
203 'enable_multidex': 1,
204 'enable_multidex_configurations': ['Debug'],
203 'conditions': [ 205 'conditions': [
204 # Only attempt loading the library from the APK for 64 bit devices 206 # Only attempt loading the library from the APK for 64 bit devices
205 # until the number of 32 bit devices which don't support this 207 # until the number of 32 bit devices which don't support this
206 # approach falls to a minimal level - http://crbug.com/390618. 208 # approach falls to a minimal level - http://crbug.com/390618.
207 ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { 209 ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', {
208 'load_library_from_zip': 1, 210 'load_library_from_zip': 1,
209 }], 211 }],
210 ], 212 ],
211 }, 213 },
212 'dependencies': [ 214 'dependencies': [
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 } 418 }
417 ], 419 ],
418 ], 420 ],
419 } 421 }
420 422
421 # Local Variables: 423 # Local Variables:
422 # tab-width:2 424 # tab-width:2
423 # indent-tabs-mode:nil 425 # indent-tabs-mode:nil
424 # End: 426 # End:
425 # vim: set expandtab tabstop=2 shiftwidth=2: 427 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698