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

Unified Diff: gyp/android_deps.gyp

Issue 1038863003: WIP: Added support for giflib, updated jpeg and png (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Added conditionals to jpeg and png sources, removed extra giflib Created 5 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 side-by-side diff with in-line comments
Download patch
Index: gyp/android_deps.gyp
diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp
index 1669b2bdad1704164362e8f62307b03a0ee6c797..ceecb062bceb9e3643eb9e5b0fea136c9c4882dc 100644
--- a/gyp/android_deps.gyp
+++ b/gyp/android_deps.gyp
@@ -1,3 +1,8 @@
+# Copyright 2015 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
# This GYP file stores the dependencies necessary to build Skia on the Android
# platform. The OS doesn't provide many stable libraries as part of the
# distribution so we have to build a few of them ourselves.
@@ -35,18 +40,6 @@
},
},
{
- 'target_name': 'gif',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'libraries' : [
- 'libgif.a',
- ],
- 'include_dirs': [
- 'external/giflib',
- ],
- },
- },
- {
'target_name': 'png',
'type': 'none',
'direct_dependent_settings': {
« no previous file with comments | « DEPS ('k') | gyp/common_variables.gypi » ('j') | platform_tools/android/gyp/dependencies.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698