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

Unified Diff: skia/skia_system.gypi

Issue 639423005: Remove use_system_skia and skia_system.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove another instance of use_system_skia Created 6 years, 2 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
« no previous file with comments | « skia/skia.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia_system.gypi
diff --git a/skia/skia_system.gypi b/skia/skia_system.gypi
deleted file mode 100644
index a26bdc0615acaa5c67df913bb6ca206e3488b7d7..0000000000000000000000000000000000000000
--- a/skia/skia_system.gypi
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2013 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 gypi file contains the shim header generation and other settings to use
-# the system version of skia on Android.
-{
- 'direct_dependent_settings': {
- # This makes the Android build system set the include path appropriately.
- 'libraries': [ '-lskia' ],
- # Some Chrome code uses non-public header files (http://crbug.com/274425),
- # so we need to add this include path for now to make it build. The system
- # version of skia is already required to be the same as the chromium version
- # so using the bundled headers shouldn't break anything.
- 'include_dirs': [
- '../third_party/skia/src/core',
- ],
- },
- 'link_settings': {
- # This actually causes the final binary to be linked against skia.
- 'libraries': [ '-lskia' ],
- },
- 'variables': {
- 'headers_root_path': '../third_party/skia/include',
- },
- 'includes': [
- '../third_party/skia/gyp/public_headers.gypi',
- '../build/shim_headers.gypi',
- ],
-}
« no previous file with comments | « skia/skia.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698