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

Unified Diff: gyp/libjpeg.gyp

Issue 1406153015: Remove dependencies on Android's forked decoder libraries (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: It is 2015 Created 5 years, 1 month 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
« no previous file with comments | « gyp/images.gyp ('k') | gyp/libjpeg-turbo-selector.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/libjpeg.gyp
diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp
deleted file mode 100644
index 76052bfa1492f8a184bf028a4851fe304dccfadd..0000000000000000000000000000000000000000
--- a/gyp/libjpeg.gyp
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified
-# such that all source paths point into that directory.
-# See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp
-# from Chrome's libjpeg port, rather than making our own copy') for a better
-# long-term solution.
-
-{
- 'variables': {
- 'use_system_libjpeg%': 0,
- 'skia_warnings_as_errors': 0,
- },
- 'conditions': [
- ['skia_os == "android"', {
- 'targets': [
- {
- 'target_name': 'libjpeg',
- 'type': 'none',
- 'dependencies': [
- 'android_deps.gyp:jpeg',
- ],
- 'export_dependent_settings': [
- 'android_deps.gyp:jpeg',
- ],
- },
- ],
- }, { # skia_os != android
- 'targets': [
- {
- 'target_name': 'libjpeg',
- 'type': 'none',
- 'dependencies': [
- 'libjpeg-turbo.gyp:libjpeg-turbo',
- ],
- 'export_dependent_settings': [
- 'libjpeg-turbo.gyp:libjpeg-turbo',
- ],
- },
- ],
- }],
- ],
-}
« no previous file with comments | « gyp/images.gyp ('k') | gyp/libjpeg-turbo-selector.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698