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

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

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: final patch? Created 5 years, 7 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 | « chrome/android/chrome_apk.gyp ('k') | chrome/android/java_staging/.gitignore » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
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
3 # found in the LICENSE file.
4 {
5 'variables': {
6 'variables': {
7 'native_lib_placeholders_file%': '',
8 'chrome_apk_use_relocation_packer%': 1,
9 'conditions': [
10 # Use the chromium linker unless cygprofile instrumentation is active.
11 # Chromium linker causes instrumentation to return incorrect results.
12 ['order_profiling == 0', {
13 'chrome_apk_use_chromium_linker%': 1,
14 'chrome_apk_load_library_from_zip%': 1,
15 }, {
16 'chrome_apk_use_chromium_linker%': 0,
17 'chrome_apk_load_library_from_zip%': 0,
18 }],
19 ],
20 },
21 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)',
22 'java_in_dir_suffix': '/src_dummy',
23 'native_lib_version_name': '<(version_full)',
24 'proguard_enabled': 'true',
25 'proguard_flags_paths': ['<(DEPTH)/chrome/android/java_staging/proguard.flag s'],
26 'additional_input_paths' : ['<@(chrome_android_pak_output_resources)'],
27 'conditions': [
28 ['component != "shared_library"', {
29 # Only enable the chromium linker on regular builds, since the
30 # component build crashes on Android 4.4. See b/11379966
31 'use_chromium_linker': '<(chrome_apk_use_chromium_linker)',
32 'conditions': [
33 ['"<(native_lib_placeholders_file)" != ""', {
34 'native_lib_placeholders': ['<!@(cat <(native_lib_placeholders_file) )'],
35 }],
36 # Only attempt relocation packing for 32-bit and 64-bit arm builds
37 # that enable the chromium linker. Packing is a no-op if this
38 # is not a Release build.
39 ['chrome_apk_use_chromium_linker == 1 and (target_arch == "arm" or tar get_arch == "arm64")', {
40 'use_relocation_packer': '<(chrome_apk_use_relocation_packer)',
41 }],
42 ],
43 }],
44 ],
45 'run_findbugs': 0,
46 },
47 'includes': [ '../../build/java_apk.gypi' ],
48 }
OLDNEW
« no previous file with comments | « chrome/android/chrome_apk.gyp ('k') | chrome/android/java_staging/.gitignore » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698