| Index: src/core/SkPaintOptionsAndroid.cpp
|
| diff --git a/src/core/SkPaintOptionsAndroid.cpp b/src/core/SkPaintOptionsAndroid.cpp
|
| index 31f489cb728434e7f2519bd4bb9f03c02ececb79..f8a65e9d90f0b0c7467e105efa331d0dd89e9e9a 100644
|
| --- a/src/core/SkPaintOptionsAndroid.cpp
|
| +++ b/src/core/SkPaintOptionsAndroid.cpp
|
| @@ -12,14 +12,12 @@
|
| #include "SkThread.h"
|
| #include <cstring>
|
|
|
| -#ifdef SK_BUILD_FOR_ANDROID
|
| -
|
| SkLanguage SkLanguage::getParent() const {
|
| SkASSERT(!fTag.isEmpty());
|
| const char* tag = fTag.c_str();
|
|
|
| // strip off the rightmost "-.*"
|
| - char* parentTagEnd = strrchr(tag, '-');
|
| + const char* parentTagEnd = strrchr(tag, '-');
|
| if (parentTagEnd == NULL) {
|
| return SkLanguage();
|
| }
|
| @@ -40,5 +38,3 @@ void SkPaintOptionsAndroid::unflatten(SkFlattenableReadBuffer& buffer) {
|
| fLanguage = SkLanguage(tag);
|
| fUseFontFallbacks = buffer.readBool();
|
| }
|
| -
|
| -#endif
|
|
|