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

Side by Side Diff: android_webview/android_webview.gyp

Issue 12730006: Android: rename android_build_type gyp variable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add bug # to comments Created 7 years, 9 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 | 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 (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 ],
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'libwebviewchromium', 13 'target_name': 'libwebviewchromium',
14 'type': 'shared_library', 14 'type': 'shared_library',
15 'android_unmangled_name': 1, 15 'android_unmangled_name': 1,
16 'dependencies': [ 16 'dependencies': [
17 'android_webview_common', 17 'android_webview_common',
18 ], 18 ],
19 'ldflags': [ 19 'ldflags': [
20 # fix linking to hidden symbols and re-enable this (crbug.com/157326) 20 # fix linking to hidden symbols and re-enable this (crbug.com/157326)
21 '-Wl,--no-fatal-warnings' 21 '-Wl,--no-fatal-warnings'
22 ], 22 ],
23 'sources': [ 23 'sources': [
24 'lib/main/webview_entry_point.cc', 24 'lib/main/webview_entry_point.cc',
25 ], 25 ],
26 'conditions': [ 26 'conditions': [
27 ['android_build_type != 0', { 27 ['android_webview_build == 1', {
28 'libraries': [ 28 'libraries': [
29 # The "android" gyp backend doesn't quite handle static libraries' 29 # The "android" gyp backend doesn't quite handle static libraries'
30 # dependencies correctly; force this to be linked as a workaround. 30 # dependencies correctly; force this to be linked as a workaround.
31 'cpufeatures.a', 31 'cpufeatures.a',
32 ], 32 ],
33 }], 33 }],
34 ], 34 ],
35 }, 35 },
36 { 36 {
37 'target_name': 'android_webview_pak', 37 'target_name': 'android_webview_pak',
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 'java_in_dir': '../android_webview/java', 212 'java_in_dir': '../android_webview/java',
213 'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebviewchromium.so'], 213 'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebviewchromium.so'],
214 'additional_input_paths': [ 214 'additional_input_paths': [
215 '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak', 215 '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
216 ], 216 ],
217 }, 217 },
218 'includes': [ '../build/java_apk.gypi' ], 218 'includes': [ '../build/java_apk.gypi' ],
219 }, 219 },
220 ], 220 ],
221 } 221 }
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