diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 20:27:22 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 20:27:22 +0000 |
| commit | b5586a17e5d3454db2e49e5380559d113f3b933c (patch) | |
| tree | 909042fe82e1c40dfdaef00e2d51e60509f6bdd1 /skia | |
| parent | 9f9b3bdb5e877770612abfad2176ffbf3f1ad10d (diff) | |
| download | chromium_src-b5586a17e5d3454db2e49e5380559d113f3b933c.zip chromium_src-b5586a17e5d3454db2e49e5380559d113f3b933c.tar.gz chromium_src-b5586a17e5d3454db2e49e5380559d113f3b933c.tar.bz2 | |
Minor skia fixes for Android
- Pick up the correct BitmapPlatformDevice header when __linux__ is defined
- Exclude SkPDFFont.cpp as Android does not provide a valid value for
SK_SFNTLY_SUBSETTER
Review URL: https://chromiumcodereview.appspot.com/10636009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/bitmap_platform_device.h | 6 | ||||
| -rw-r--r-- | skia/skia.gyp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/skia/ext/bitmap_platform_device.h b/skia/ext/bitmap_platform_device.h index 52ce651..03e1ae8 100644 --- a/skia/ext/bitmap_platform_device.h +++ b/skia/ext/bitmap_platform_device.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 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. @@ -13,10 +13,10 @@ #include "skia/ext/bitmap_platform_device_win.h" #elif defined(__APPLE__) #include "skia/ext/bitmap_platform_device_mac.h" -#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun) -#include "skia/ext/bitmap_platform_device_linux.h" #elif defined(ANDROID) #include "skia/ext/bitmap_platform_device_android.h" +#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun) +#include "skia/ext/bitmap_platform_device_linux.h" #endif #endif // SKIA_EXT_BITMAP_PLATFORM_DEVICE_H_ diff --git a/skia/skia.gyp b/skia/skia.gyp index e6fade6..3ea140b 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -953,6 +953,7 @@ ], 'sources!': [ 'ext/vector_platform_device_skia.cc', + '../third_party/skia/src/pdf/SkPDFFont.cpp', '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', ], 'export_dependent_settings': [ |