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

Side by Side Diff: ppapi/ppapi.gyp

Issue 10704208: Some misc gyp fix-up for Android (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 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
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 # This is the "public" ppapi.gyp file, which must have dependencies on the 5 # This is the "public" ppapi.gyp file, which must have dependencies on the
6 # redistributable portions of PPAPI only. This prevents circular dependencies 6 # redistributable portions of PPAPI only. This prevents circular dependencies
7 # in the .gyp files (since ppapi_internal depends on parts of Chrome). 7 # in the .gyp files (since ppapi_internal depends on parts of Chrome).
8 8
9 { 9 {
10 'variables': { 10 'variables': {
11 'chromium_code': 1, # Use higher warning level. 11 'chromium_code': 1, # Use higher warning level.
12 }, 12 },
13 'target_defaults': { 13 'target_defaults': {
14 'conditions': [ 14 'conditions': [
15 # Linux shared libraries should always be built -fPIC. 15 # Linux shared libraries should always be built -fPIC.
16 # 16 #
17 # TODO(ajwong): For internal pepper plugins, which are statically linked 17 # TODO(ajwong): For internal pepper plugins, which are statically linked
18 # into chrome, do we want to build w/o -fPIC? If so, how can we express 18 # into chrome, do we want to build w/o -fPIC? If so, how can we express
19 # that in the build system? 19 # that in the build system?
20 ['os_posix == 1 and OS != "mac"', { 20 ['os_posix == 1 and OS != "mac" and OS != "android"', {
21 'cflags': ['-fPIC', '-fvisibility=hidden'], 21 'cflags': ['-fPIC', '-fvisibility=hidden'],
22 22
23 # This is needed to make the Linux shlib build happy. Without this, 23 # This is needed to make the Linux shlib build happy. Without this,
24 # -fvisibility=hidden gets stripped by the exclusion in common.gypi 24 # -fvisibility=hidden gets stripped by the exclusion in common.gypi
25 # that is triggered when a shared library build is specified. 25 # that is triggered when a shared library build is specified.
26 'cflags/': [['include', '^-fvisibility=hidden$']], 26 'cflags/': [['include', '^-fvisibility=hidden$']],
27 }], 27 }],
28 ], 28 ],
29 }, 29 },
30 'includes': [ 30 'includes': [
31 'ppapi_sources.gypi', 31 'ppapi_sources.gypi',
32 'ppapi_cpp.gypi', 32 'ppapi_cpp.gypi',
33 'ppapi_gl.gypi', 33 'ppapi_gl.gypi',
34 ], 34 ],
35 } 35 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698