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

Side by Side Diff: android_webview/android_webview.gyp

Issue 11308030: Use _target_name instead of package_name for java*.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar
Patch Set: Created 8 years, 1 month 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') | build/android/ant/chromium-apk.xml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'libwebviewchromium', 10 'target_name': 'libwebviewchromium',
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 { 89 {
90 'target_name': 'android_webview_java', 90 'target_name': 'android_webview_java',
91 'type': 'none', 91 'type': 'none',
92 'dependencies': [ 92 'dependencies': [
93 '../content/content.gyp:content_java', 93 '../content/content.gyp:content_java',
94 '../chrome/browser/component/components.gyp:navigation_interception_java ', 94 '../chrome/browser/component/components.gyp:navigation_interception_java ',
95 '../chrome/browser/component/components.gyp:web_contents_delegate_androi d_java', 95 '../chrome/browser/component/components.gyp:web_contents_delegate_androi d_java',
96 '../ui/ui.gyp:ui_java', 96 '../ui/ui.gyp:ui_java',
97 ], 97 ],
98 'variables': { 98 'variables': {
99 'package_name': 'android_webview_java',
100 'java_in_dir': '../android_webview/java', 99 'java_in_dir': '../android_webview/java',
101 }, 100 },
102 'includes': [ '../build/java.gypi' ], 101 'includes': [ '../build/java.gypi' ],
103 }, 102 },
104 { 103 {
105 'target_name': 'android_webview_apk', 104 'target_name': 'android_webview_apk',
106 'type': 'none', 105 'type': 'none',
107 'dependencies': [ 106 'dependencies': [
108 '../base/base.gyp:base_java', 107 '../base/base.gyp:base_java',
109 '../chrome/browser/component/components.gyp:navigation_interception_java ', 108 '../chrome/browser/component/components.gyp:navigation_interception_java ',
110 '../chrome/browser/component/components.gyp:web_contents_delegate_androi d_java', 109 '../chrome/browser/component/components.gyp:web_contents_delegate_androi d_java',
111 '../chrome/chrome_resources.gyp:packed_extra_resources', 110 '../chrome/chrome_resources.gyp:packed_extra_resources',
112 '../chrome/chrome_resources.gyp:packed_resources', 111 '../chrome/chrome_resources.gyp:packed_resources',
113 '../content/content.gyp:content_java', 112 '../content/content.gyp:content_java',
114 '../media/media.gyp:media_java', 113 '../media/media.gyp:media_java',
115 '../net/net.gyp:net_java', 114 '../net/net.gyp:net_java',
116 '../ui/ui.gyp:ui_java', 115 '../ui/ui.gyp:ui_java',
117 'libwebviewchromium', 116 'libwebviewchromium',
118 ], 117 ],
119 'variables': { 118 'variables': {
120 'package_name': 'android_webview',
121 'apk_name': 'AndroidWebView', 119 'apk_name': 'AndroidWebView',
122 'manifest_package_name': 'org.chromium.android_webview', 120 'manifest_package_name': 'org.chromium.android_webview',
123 'java_in_dir': '../android_webview/java', 121 'java_in_dir': '../android_webview/java',
124 'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebviewchromium.so'], 122 'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebviewchromium.so'],
125 'input_pak_files': [ 123 'input_pak_files': [
126 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', 124 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
127 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', 125 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
128 '<(SHARED_INTERMEDIATE_DIR)/repack/en-US.pak', 126 '<(SHARED_INTERMEDIATE_DIR)/repack/en-US.pak',
129 ], 127 ],
130 'copied_pak_files': [ 128 'copied_pak_files': [
(...skipping 23 matching lines...) Expand all
154 '../chrome/chrome_resources.gyp:packed_resources', 152 '../chrome/chrome_resources.gyp:packed_resources',
155 '../content/content.gyp:content_java', 153 '../content/content.gyp:content_java',
156 '../content/content.gyp:content_java_test_support', 154 '../content/content.gyp:content_java_test_support',
157 '../media/media.gyp:media_java', 155 '../media/media.gyp:media_java',
158 '../net/net.gyp:net_java', 156 '../net/net.gyp:net_java',
159 '../ui/ui.gyp:ui_java', 157 '../ui/ui.gyp:ui_java',
160 'android_webview_java', 158 'android_webview_java',
161 'libwebviewchromium', 159 'libwebviewchromium',
162 ], 160 ],
163 'variables': { 161 'variables': {
164 'package_name': 'android_webview_test',
165 'apk_name': 'AndroidWebViewTest', 162 'apk_name': 'AndroidWebViewTest',
166 'java_in_dir': '../android_webview/javatests', 163 'java_in_dir': '../android_webview/javatests',
167 'resource_dir': 'res', 164 'resource_dir': 'res',
168 }, 165 },
169 'copies': [ 166 'copies': [
170 { 167 {
171 'destination': '<(PRODUCT_DIR)/android_webview_test/assets', 168 'destination': '<(PRODUCT_DIR)/android_webview_test/assets',
172 'files': [ '<!@(find <(java_in_dir)/assets -type f -name "*")' ] 169 'files': [ '<!@(find <(java_in_dir)/assets -type f -name "*")' ]
173 }, 170 },
174 ], 171 ],
175 'includes': [ '../build/java_apk.gypi' ], 172 'includes': [ '../build/java_apk.gypi' ],
176 }, 173 },
177 ], 174 ],
178 } 175 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gyp » ('j') | build/android/ant/chromium-apk.xml » ('J')

Powered by Google App Engine
This is Rietveld 408576698