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

Side by Side Diff: android_webview/android_webview.gyp

Issue 11830043: Move content/components/navigation_interception to src/components (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Revert content gyp change Created 7 years, 11 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
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 ], 93 ],
94 'action': ['python', '<(repack_path)', '<@(_outputs)', 94 'action': ['python', '<(repack_path)', '<@(_outputs)',
95 '<@(pak_inputs)'], 95 '<@(pak_inputs)'],
96 }], 96 }],
97 }, 97 },
98 { 98 {
99 'target_name': 'android_webview_common', 99 'target_name': 'android_webview_common',
100 'type': 'static_library', 100 'type': 'static_library',
101 'dependencies': [ 101 'dependencies': [
102 '../android_webview/native/webview_native.gyp:webview_native', 102 '../android_webview/native/webview_native.gyp:webview_native',
103 '../components/components.gyp:navigation_interception',
103 '../content/content.gyp:content', 104 '../content/content.gyp:content',
104 '../content/content.gyp:navigation_interception',
105 '../content/content.gyp:web_contents_delegate_android', 105 '../content/content.gyp:web_contents_delegate_android',
106 '../skia/skia.gyp:skia', 106 '../skia/skia.gyp:skia',
107 'android_webview_pak', 107 'android_webview_pak',
108 ], 108 ],
109 'include_dirs': [ 109 'include_dirs': [
110 '..', 110 '..',
111 '../skia/config', 111 '../skia/config',
112 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/', 112 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/',
113 ], 113 ],
114 'sources': [ 114 'sources': [
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 'renderer/aw_render_process_observer.cc', 178 'renderer/aw_render_process_observer.cc',
179 'renderer/aw_render_process_observer.h', 179 'renderer/aw_render_process_observer.h',
180 'renderer/aw_render_view_ext.cc', 180 'renderer/aw_render_view_ext.cc',
181 'renderer/aw_render_view_ext.h', 181 'renderer/aw_render_view_ext.h',
182 ], 182 ],
183 }, 183 },
184 { 184 {
185 'target_name': 'android_webview_java', 185 'target_name': 'android_webview_java',
186 'type': 'none', 186 'type': 'none',
187 'dependencies': [ 187 'dependencies': [
188 '../components/components.gyp:navigation_interception_java',
188 '../content/content.gyp:content_java', 189 '../content/content.gyp:content_java',
189 '../content/content.gyp:navigation_interception_java',
190 '../content/content.gyp:web_contents_delegate_android_java', 190 '../content/content.gyp:web_contents_delegate_android_java',
191 '../ui/ui.gyp:ui_java', 191 '../ui/ui.gyp:ui_java',
192 ], 192 ],
193 'variables': { 193 'variables': {
194 'package_name': 'android_webview_java', 194 'package_name': 'android_webview_java',
195 'java_in_dir': '../android_webview/java', 195 'java_in_dir': '../android_webview/java',
196 }, 196 },
197 'includes': [ '../build/java.gypi' ], 197 'includes': [ '../build/java.gypi' ],
198 }, 198 },
199 { 199 {
200 'target_name': 'android_webview_apk', 200 'target_name': 'android_webview_apk',
201 'type': 'none', 201 'type': 'none',
202 'dependencies': [ 202 'dependencies': [
203 '../base/base.gyp:base_java', 203 '../base/base.gyp:base_java',
204 '../components/components.gyp:navigation_interception_java',
204 '../content/content.gyp:content_java', 205 '../content/content.gyp:content_java',
205 '../content/content.gyp:navigation_interception_java',
206 '../content/content.gyp:web_contents_delegate_android_java', 206 '../content/content.gyp:web_contents_delegate_android_java',
207 '../media/media.gyp:media_java', 207 '../media/media.gyp:media_java',
208 '../net/net.gyp:net_java', 208 '../net/net.gyp:net_java',
209 '../ui/ui.gyp:ui_java', 209 '../ui/ui.gyp:ui_java',
210 'libwebviewchromium', 210 'libwebviewchromium',
211 ], 211 ],
212 'variables': { 212 'variables': {
213 'package_name': 'android_webview', 213 'package_name': 'android_webview',
214 'apk_name': 'AndroidWebView', 214 'apk_name': 'AndroidWebView',
215 'manifest_package_name': 'org.chromium.android_webview', 215 'manifest_package_name': 'org.chromium.android_webview',
216 'java_in_dir': '../android_webview/java', 216 'java_in_dir': '../android_webview/java',
217 'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebviewchromium.so'], 217 'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebviewchromium.so'],
218 }, 218 },
219 'includes': [ '../build/java_apk.gypi' ], 219 'includes': [ '../build/java_apk.gypi' ],
220 }, 220 },
221 ], 221 ],
222 } 222 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698