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

Side by Side Diff: android_webview/android_webview.gyp

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 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 | « no previous file | base/base.gyp » ('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 2009 The Chromium Authors. All rights reserved. 1 # Copyright 2009 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 }, 7 },
8 'includes': [ 8 'includes': [
9 'android_webview_tests.gypi', 9 'android_webview_tests.gypi',
10 ], 10 ],
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 'lib/main/aw_main_delegate.cc', 188 'lib/main/aw_main_delegate.cc',
189 'lib/main/aw_main_delegate.h', 189 'lib/main/aw_main_delegate.h',
190 'public/browser/draw_gl.h', 190 'public/browser/draw_gl.h',
191 'renderer/aw_content_renderer_client.cc', 191 'renderer/aw_content_renderer_client.cc',
192 'renderer/aw_content_renderer_client.h', 192 'renderer/aw_content_renderer_client.h',
193 'renderer/aw_render_process_observer.cc', 193 'renderer/aw_render_process_observer.cc',
194 'renderer/aw_render_process_observer.h', 194 'renderer/aw_render_process_observer.h',
195 'renderer/aw_render_view_ext.cc', 195 'renderer/aw_render_view_ext.cc',
196 'renderer/aw_render_view_ext.h', 196 'renderer/aw_render_view_ext.h',
197 ], 197 ],
198 'link_settings': {
199 'libraries': [
200 '-ljnigraphics',
201 ],
202 },
198 }, 203 },
199 { 204 {
200 'target_name': 'android_webview_java', 205 'target_name': 'android_webview_java',
201 'type': 'none', 206 'type': 'none',
202 'dependencies': [ 207 'dependencies': [
203 '../components/components.gyp:navigation_interception_java', 208 '../components/components.gyp:navigation_interception_java',
204 '../components/components.gyp:web_contents_delegate_android_java', 209 '../components/components.gyp:web_contents_delegate_android_java',
205 '../content/content.gyp:content_java', 210 '../content/content.gyp:content_java',
206 '../ui/ui.gyp:ui_java', 211 '../ui/ui.gyp:ui_java',
207 ], 212 ],
208 'variables': { 213 'variables': {
209 'java_in_dir': '../android_webview/java', 214 'java_in_dir': '../android_webview/java',
210 }, 215 },
211 'includes': [ '../build/java.gypi' ], 216 'includes': [ '../build/java.gypi' ],
212 }, 217 },
213 ], 218 ],
214 } 219 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698