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

Side by Side Diff: android_webview/android_webview.gyp

Issue 208263016: Revert "Enable DMP for system Chromium WebView on Android" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | base/allocator/allocator.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 'conditions': [ 8 'conditions': [
9 ['android_webview_build==0', { 9 ['android_webview_build==0', {
10 'includes': [ 10 'includes': [
11 'android_webview_tests.gypi', 11 'android_webview_tests.gypi',
12 ], 12 ],
13 }], 13 }],
14 ], 14 ],
15 'targets': [ 15 'targets': [
16 { 16 {
17 'target_name': 'libwebviewchromium', 17 'target_name': 'libwebviewchromium',
18 'type': 'shared_library', 18 'type': 'shared_library',
19 'android_unmangled_name': 1, 19 'android_unmangled_name': 1,
20 'dependencies': [ 20 'dependencies': [
21 'android_webview_common', 21 'android_webview_common',
22 ], 22 ],
23 'conditions': [ 23 'conditions': [
24 # Avoid clashes between the versions of this library built with 24 # Avoid clashes between the versions of this library built with
25 # android_webview_build==1 by using a different name prefix. 25 # android_webview_build==1 by using a different name prefix.
26 [ 'android_webview_build==0', { 26 [ 'android_webview_build==0', {
27 'product_prefix': 'libstandalone', 27 'product_prefix': 'libstandalone',
28 }], 28 }],
29 # The general approach is to allow the executable target to choose
30 # the allocator, but as in the WebView case we are building a library
31 # only, put the dependency on the allocator here
32 [ 'android_webview_build==1 and android_use_tcmalloc==1', {
33 'dependencies': [
34 '../base/allocator/allocator.gyp:allocator', ],
35 }],
36 [ 'android_webview_build==1 and use_system_skia==0', { 29 [ 'android_webview_build==1 and use_system_skia==0', {
37 # When not using the system skia there are linker warnings about 30 # When not using the system skia there are linker warnings about
38 # overriden hidden symbols which there's no easy way to eliminate; 31 # overriden hidden symbols which there's no easy way to eliminate;
39 # disable them. http://crbug.com/157326 32 # disable them. http://crbug.com/157326
40 'ldflags': [ 33 'ldflags': [
41 '-Wl,--no-fatal-warnings', 34 '-Wl,--no-fatal-warnings',
42 ], 35 ],
43 'ldflags!': [ 36 'ldflags!': [
44 '-Wl,--fatal-warnings', 37 '-Wl,--fatal-warnings',
45 ], 38 ],
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 '../content/content.gyp:content_java', 229 '../content/content.gyp:content_java',
237 '../ui/android/ui_android.gyp:ui_java', 230 '../ui/android/ui_android.gyp:ui_java',
238 ], 231 ],
239 'variables': { 232 'variables': {
240 'java_in_dir': '../android_webview/java', 233 'java_in_dir': '../android_webview/java',
241 }, 234 },
242 'includes': [ '../build/java.gypi' ], 235 'includes': [ '../build/java.gypi' ],
243 }, 236 },
244 ], 237 ],
245 } 238 }
OLDNEW
« no previous file with comments | « no previous file | base/allocator/allocator.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698