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

Side by Side Diff: chrome/chrome_android.gypi

Issue 329223002: Android: enable chromium linker on the shells. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes relro bundle Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'chromium_code': 1, 6 'chromium_code': 1,
7 'package_name': 'chrome_shell_apk', 7 'package_name': 'chrome_shell_apk',
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'chrome_android_paks.gypi', # Included for the list of pak resources. 10 'chrome_android_paks.gypi', # Included for the list of pak resources.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 'apk_name': 'ChromeShell', 65 'apk_name': 'ChromeShell',
66 'manifest_package_name': 'org.chromium.chrome.shell', 66 'manifest_package_name': 'org.chromium.chrome.shell',
67 'java_in_dir': 'android/shell/java', 67 'java_in_dir': 'android/shell/java',
68 'resource_dir': 'android/shell/res', 68 'resource_dir': 'android/shell/res',
69 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', 69 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)',
70 'native_lib_target': 'libchromeshell', 70 'native_lib_target': 'libchromeshell',
71 'native_lib_version_name': '<(version_full)', 71 'native_lib_version_name': '<(version_full)',
72 'additional_input_paths': [ 72 'additional_input_paths': [
73 '<@(chrome_android_pak_output_resources)', 73 '<@(chrome_android_pak_output_resources)',
74 ], 74 ],
75 'conditions': [
76 ['component != "shared_library" and target_arch != "arm64" and target_ arch != "x64"', {
77 # Only enable the chromium linker on regular builds, since the
78 # component build crashes on Android 4.4. See b/11379966
79 'use_chromium_linker': '1',
80 }],
81 ],
75 }, 82 },
76 'includes': [ '../build/java_apk.gypi', ], 83 'includes': [ '../build/java_apk.gypi', ],
77 }, 84 },
78 { 85 {
79 # chrome_shell_apk creates a .jar as a side effect. Any java targets 86 # chrome_shell_apk creates a .jar as a side effect. Any java targets
80 # that need that .jar in their classpath should depend on this target, 87 # that need that .jar in their classpath should depend on this target,
81 # chrome_shell_apk_java. Dependents of chrome_shell_apk receive its 88 # chrome_shell_apk_java. Dependents of chrome_shell_apk receive its
82 # jar path in the variable 'apk_output_jar_path'. 89 # jar path in the variable 'apk_output_jar_path'.
83 # This target should only be used by targets which instrument 90 # This target should only be used by targets which instrument
84 # chrome_shell_apk. 91 # chrome_shell_apk.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 { 141 {
135 'destination': '<(chrome_android_pak_output_folder)', 142 'destination': '<(chrome_android_pak_output_folder)',
136 'files': [ 143 'files': [
137 '<@(chrome_android_pak_input_resources)', 144 '<@(chrome_android_pak_input_resources)',
138 ], 145 ],
139 } 146 }
140 ], 147 ],
141 }, 148 },
142 ], 149 ],
143 } 150 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698