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

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

Issue 1947983006: ☯ Remove deprecated libchrome_public target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/BUILD.gn ('k') | infra/scripts/legacy/scripts/slave/chromium/sizes.py » ('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 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 'all_dependent_settings': { 94 'all_dependent_settings': {
95 'variables': { 95 'variables': {
96 'additional_input_paths': ['<(jinja_outputs_zip)'], 96 'additional_input_paths': ['<(jinja_outputs_zip)'],
97 'dependencies_res_zip_paths': ['<(jinja_outputs_zip)'], 97 'dependencies_res_zip_paths': ['<(jinja_outputs_zip)'],
98 }, 98 },
99 }, 99 },
100 'includes': [ '../../build/android/jinja_template.gypi' ], 100 'includes': [ '../../build/android/jinja_template.gypi' ],
101 }, 101 },
102 { 102 {
103 # The base library used in both ChromePublic and ChromeSyncShell. 103 # The base library used in both ChromePublic and ChromeSyncShell.
104 'target_name': 'libchrome_public_base', 104 'target_name': 'libchrome_base',
105 'type': 'none', 105 'type': 'none',
106 'dependencies': [ 106 'dependencies': [
107 '../../chrome/chrome.gyp:chrome_android_core', 107 '../../chrome/chrome.gyp:chrome_android_core',
108 # TODO(yfriedman): move this DEP to chrome_android_core to be shared 108 # TODO(yfriedman): move this DEP to chrome_android_core to be shared
109 # between internal/external. 109 # between internal/external.
110 '../../third_party/cld_2/cld_2.gyp:cld2_dynamic', 110 '../../third_party/cld_2/cld_2.gyp:cld2_dynamic',
111 ], 111 ],
112 'include_dirs': [ 112 'include_dirs': [
113 '../..', 113 '../..',
114 ], 114 ],
115 'conditions': [ 115 'conditions': [
116 # conditions for order_text_section 116 # conditions for order_text_section
117 # Cygprofile methods need to be linked into the instrumented build. 117 # Cygprofile methods need to be linked into the instrumented build.
118 ['order_profiling!=0', { 118 ['order_profiling!=0', {
119 'conditions': [ 119 'conditions': [
120 ['OS=="android"', { 120 ['OS=="android"', {
121 'dependencies': [ '../../tools/cygprofile/cygprofile.gyp:cygprofil e' ], 121 'dependencies': [ '../../tools/cygprofile/cygprofile.gyp:cygprofil e' ],
122 }], 122 }],
123 ], 123 ],
124 }], # order_profiling!=0 124 }], # order_profiling!=0
125 ], 125 ],
126 }, 126 },
127 { 127 {
128 # GN: //chrome/android:chrome_public 128 # GN: //chrome/android:chrome_public
129 # TODO(yfriedman): Replace with libchrome. 129 'target_name': 'libchrome',
130 'target_name': 'libchrome_public',
131 'type': 'shared_library', 130 'type': 'shared_library',
132 'sources': [ 131 'sources': [
133 '<@(chrome_app_native_sources)', 132 '<@(chrome_app_native_sources)',
134 ], 133 ],
135 'dependencies': [ 134 'dependencies': [
136 'libchrome_public_base', 135 'libchrome_base',
137 ], 136 ],
138 }, 137 },
139 { 138 {
140 # GN: //chrome/android:chrome_sync_shell 139 # GN: //chrome/android:chrome_sync_shell
141 'target_name': 'libchrome_sync_shell', 140 'target_name': 'libchrome_sync_shell',
142 'type': 'shared_library', 141 'type': 'shared_library',
143 'sources': [ 142 'sources': [
144 '<@(chrome_sync_shell_app_native_sources)', 143 '<@(chrome_sync_shell_app_native_sources)',
145 ], 144 ],
146 'dependencies': [ 145 'dependencies': [
147 'libchrome_public_base', 146 'libchrome_base',
148 '../../sync/sync.gyp:sync', 147 '../../sync/sync.gyp:sync',
149 '../../sync/sync.gyp:test_support_sync_fake_server_android', 148 '../../sync/sync.gyp:test_support_sync_fake_server_android',
150 ], 149 ],
151 }, 150 },
152 { 151 {
153 # GN: //chrome/android:chrome_public_apk_manifest 152 # GN: //chrome/android:chrome_public_apk_manifest
154 'target_name': 'chrome_public_manifest', 153 'target_name': 'chrome_public_manifest',
155 'type': 'none', 154 'type': 'none',
156 'variables': { 155 'variables': {
157 'jinja_inputs': ['java/AndroidManifest.xml'], 156 'jinja_inputs': ['java/AndroidManifest.xml'],
(...skipping 23 matching lines...) Expand all
181 }, 180 },
182 'includes': [ '../../build/android/jinja_template.gypi' ], 181 'includes': [ '../../build/android/jinja_template.gypi' ],
183 }, 182 },
184 { 183 {
185 # GN: //chrome/android:chrome_public_apk 184 # GN: //chrome/android:chrome_public_apk
186 'target_name': 'chrome_public_apk', 185 'target_name': 'chrome_public_apk',
187 'type': 'none', 186 'type': 'none',
188 'variables': { 187 'variables': {
189 'android_manifest_path': '<(chrome_public_apk_manifest)', 188 'android_manifest_path': '<(chrome_public_apk_manifest)',
190 'apk_name': 'ChromePublic', 189 'apk_name': 'ChromePublic',
191 'native_lib_target': 'libchrome_public', 190 'native_lib_target': 'libchrome',
192 'java_in_dir': 'java', 191 'java_in_dir': 'java',
193 'resource_dir': '../../chrome/android/java/res_chromium', 192 'resource_dir': '../../chrome/android/java/res_chromium',
194 'enable_multidex': 1, 193 'enable_multidex': 1,
195 'enable_multidex_configurations': ['Debug'], 194 'enable_multidex_configurations': ['Debug'],
196 'conditions': [ 195 'conditions': [
197 # Only attempt loading the library from the APK for 64 bit devices 196 # Only attempt loading the library from the APK for 64 bit devices
198 # until the number of 32 bit devices which don't support this 197 # until the number of 32 bit devices which don't support this
199 # approach falls to a minimal level - http://crbug.com/390618. 198 # approach falls to a minimal level - http://crbug.com/390618.
200 ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { 199 ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', {
201 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)', 200 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)',
202 }], 201 }],
203 ], 202 ],
204 }, 203 },
205 'dependencies': [ 204 'dependencies': [
206 'chrome_android_paks_copy', 205 'chrome_android_paks_copy',
207 'chrome_public_apk_template_resources', 206 'chrome_public_apk_template_resources',
208 'libchrome_public', 207 'libchrome',
209 '../chrome.gyp:chrome_java', 208 '../chrome.gyp:chrome_java',
210 ], 209 ],
211 'includes': [ 'chrome_apk.gypi' ], 210 'includes': [ 'chrome_apk.gypi' ],
212 }, 211 },
213 { 212 {
214 # GN: N/A 213 # GN: N/A
215 # chrome_public_apk creates a .jar as a side effect. Any java targets 214 # chrome_public_apk creates a .jar as a side effect. Any java targets
216 # that need that .jar in their classpath should depend on this target, 215 # that need that .jar in their classpath should depend on this target,
217 'target_name': 'chrome_public_apk_java', 216 'target_name': 'chrome_public_apk_java',
218 'type': 'none', 217 'type': 'none',
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 } 414 }
416 ], 415 ],
417 ], 416 ],
418 } 417 }
419 418
420 # Local Variables: 419 # Local Variables:
421 # tab-width:2 420 # tab-width:2
422 # indent-tabs-mode:nil 421 # indent-tabs-mode:nil
423 # End: 422 # End:
424 # vim: set expandtab tabstop=2 shiftwidth=2: 423 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | infra/scripts/legacy/scripts/slave/chromium/sizes.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698