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

Unified Diff: gyp/skia_lib.gyp

Issue 15855006: prepare skia for shared library build on android (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: gyp/skia_lib.gyp
diff --git a/gyp/skia_base_libs.gyp b/gyp/skia_lib.gyp
similarity index 77%
rename from gyp/skia_base_libs.gyp
rename to gyp/skia_lib.gyp
index 83cc7c75295ea44e1d1f7ba8a25338fdd6525453..7334f946d5d85294c5027cfb2484232e5d27ddae 100644
--- a/gyp/skia_base_libs.gyp
+++ b/gyp/skia_lib.gyp
@@ -1,10 +1,14 @@
# The minimal set of static libraries for basic Skia functionality.
+
{
'variables': {
'component_libs': [
'core.gyp:core',
+ 'effects.gyp:effects',
+ 'images.gyp:images',
'opts.gyp:opts',
'ports.gyp:ports',
+ 'sfnt.gyp:sfnt',
'utils.gyp:utils',
],
'conditions': [
@@ -33,8 +37,15 @@
},
'targets': [
{
- 'target_name': 'skia_base_libs',
- 'type': 'none',
+ 'target_name': 'skia_lib',
+ 'conditions': [
+ [ 'skia_shared_lib', {
+ 'product_name': 'skia_local',
borenet 2013/05/31 14:29:57 Maybe I missed the discussion, but this name doesn
+ 'type': 'shared_library',
+ }, {
+ 'type': 'none',
+ }],
+ ],
'dependencies': [
'<@(component_libs)',
],

Powered by Google App Engine
This is Rietveld 408576698