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

Side by Side Diff: android_webview/android_webview.gyp

Issue 398243002: Fix the path to blink_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 5 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
« no previous file with comments | « no previous file | athena/resources/athena_resources.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 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'libwebviewchromium', 10 'target_name': 'libwebviewchromium',
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 'sources': [ 58 'sources': [
59 'lib/main/webview_entry_point.cc', 59 'lib/main/webview_entry_point.cc',
60 ], 60 ],
61 }, 61 },
62 { 62 {
63 'target_name': 'android_webview_pak', 63 'target_name': 'android_webview_pak',
64 'type': 'none', 64 'type': 'none',
65 'dependencies': [ 65 'dependencies': [
66 '<(DEPTH)/content/content_resources.gyp:content_resources', 66 '<(DEPTH)/content/content_resources.gyp:content_resources',
67 '<(DEPTH)/net/net.gyp:net_resources', 67 '<(DEPTH)/net/net.gyp:net_resources',
68 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources' ,
68 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 69 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
69 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 70 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
70 ], 71 ],
71 'actions': [ 72 'actions': [
72 { 73 {
73 'action_name': 'repack_android_webview_pack', 74 'action_name': 'repack_android_webview_pack',
74 'variables': { 75 'variables': {
75 'pak_inputs': [ 76 'pak_inputs': [
77 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources .pak',
76 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', 78 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
77 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 79 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
78 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak', 80 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak',
79 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
80 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pa k', 81 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pa k',
81 ], 82 ],
82 'pak_output': '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchro mium.pak', 83 'pak_output': '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchro mium.pak',
83 }, 84 },
84 'includes': [ '../build/repack_action.gypi' ], 85 'includes': [ '../build/repack_action.gypi' ],
85 } 86 }
86 ], 87 ],
87 }, 88 },
88 { 89 {
89 'target_name': 'android_webview_common', 90 'target_name': 'android_webview_common',
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 '../content/content.gyp:content_strings_grd', 300 '../content/content.gyp:content_strings_grd',
300 '../ui/android/ui_android.gyp:ui_strings_grd', 301 '../ui/android/ui_android.gyp:ui_strings_grd',
301 'android_webview_jarjar_ui_resources', 302 'android_webview_jarjar_ui_resources',
302 'android_webview_jarjar_content_resources' 303 'android_webview_jarjar_content_resources'
303 ], 304 ],
304 }, 305 },
305 ], 306 ],
306 }], 307 }],
307 ], 308 ],
308 } 309 }
OLDNEW
« no previous file with comments | « no previous file | athena/resources/athena_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698