Remove android specific code

Change-Id: Ib9b1f936d1aee920ba7064a9eccffaca6696812f
Reviewed-on: https://skia-review.googlesource.com/125341
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Auto-Submit: Herb Derby <herb@google.com>

src/core/SkGlyph.cpp

diff --git a/src/core/SkGlyph.cpp b/src/core/SkGlyph.cpp
index 836a47d..7536f4d 100644
--- a/src/core/SkGlyph.cpp
+++ b/src/core/SkGlyph.cpp
@@ -12,7 +12,6 @@
     fImage          = nullptr;
     fPathData       = nullptr;
     fMaskFormat     = MASK_FORMAT_UNKNOWN;
-    fForceBW        = 0;
 }
 
 void SkGlyph::toMask(SkMask* mask) const {

src/core/SkGlyph.h

diff --git a/src/core/SkGlyph.h b/src/core/SkGlyph.h
index 87cd852..dfb51cb 100644
--- a/src/core/SkGlyph.h
+++ b/src/core/SkGlyph.h
@@ -14,7 +14,6 @@
 #include "SkMask.h"
 #include "SkTypes.h"
 
-
 class SkPath;
 class SkGlyphCache;
 
@@ -86,12 +85,6 @@
         return SkChecksum::CheapMix(fID);
     }
 
-// FIXME - This is needed because the Android framework directly accesses fID.
-// Remove when fID accesses are cleaned up.
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-    operator uint32_t() const { return fID; }
-#endif
-
 private:
     static unsigned ID2SubX(uint32_t id) {
         return id >> (kSubShift + kSubShiftX);
@@ -156,12 +149,9 @@
 
     uint16_t    fWidth, fHeight;
     int16_t     fTop, fLeft;
+    int8_t      fForceBW;
 
     uint8_t     fMaskFormat;
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-    int8_t      fRsbDelta, fLsbDelta;  // used by auto-kerning
-#endif
-    int8_t      fForceBW;
 
     void initWithGlyphID(SkPackedGlyphID glyph_id);
 
@@ -217,12 +207,6 @@
  private:
     // TODO(herb) remove friend statement after SkGlyphCache cleanup.
     friend class SkGlyphCache;
-
-// FIXME - This is needed because the Android frame work directly accesses fID.
-// Remove when fID accesses are cleaned up.
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-  public:
-#endif
     SkPackedGlyphID fID;
 };
 

src/core/SkGlyphCache.h

diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h
index 523bd16..b9234df 100644
--- a/src/core/SkGlyphCache.h
+++ b/src/core/SkGlyphCache.h
@@ -217,17 +217,4 @@
     size_t                  fMemoryUsed;
 };
 
-// This will be deleted soon, and keeps android building.
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-#include "SkStrikeCache.h"
-class SkAutoGlyphCacheNoGamma : public SkExclusiveStrikePtr {
-public:
-    SkAutoGlyphCacheNoGamma(const SkPaint& paint,
-                            const SkSurfaceProps* surfaceProps,
-                            const SkMatrix* matrix)
-        : SkExclusiveStrikePtr(nullptr) {}
-};
-#define SkAutoGlyphCacheNoGamma(...) SK_REQUIRE_LOCAL_VAR(SkAutoGlyphCacheNoGamma)
-#endif
-
 #endif  // SkGlyphCache_DEFINED