3 files changed, 6 insertions, 27 deletions
diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index 2774bea01a..957d50ee5e 100644
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@@ -732,6 +732,8 @@ public:
 
 #ifdef SK_BUILD_FOR_ANDROID
     uint32_t getGenerationID() const;
+    const SkPath* getSourcePath() const;
+    void setSourcePath(const SkPath* path);
 #endif
 
     SkDEBUGCODE(void validate() const;)
@@ -747,6 +749,7 @@ private:
     mutable uint8_t     fConvexity;
 #ifdef SK_BUILD_FOR_ANDROID
     uint32_t            fGenerationID;
+    const SkPath*       fSourcePath;
 #endif
 
     // called, if dirty, by getBounds()
diff --git a/include/core/SkThread_platform.h b/include/core/SkThread_platform.h
index 94a4a1edeb..863f6e3770 100644
--- a/include/core/SkThread_platform.h
+++ b/include/core/SkThread_platform.h
@@ -53,33 +53,6 @@ SK_API int32_t sk_atomic_dec(int32_t* addr);
 
 #endif // !SK_BUILD_FOR_ANDROID
 
-#if defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_ANDROID_NDK)
-
-#include <utils/threads.h>
-
-class SkMutex : android::Mutex {
-public:
-    SkMutex() {}
-    ~SkMutex() {}
-
-    void    acquire() { this->lock(); }
-    void    release() { this->unlock(); }
-};
-
-#else
-
-/** Implemented by the porting layer, this function adds 1 to the int specified
-    by the address (in a thread-safe manner), and returns the previous value.
-*/
-SK_API int32_t sk_atomic_inc(int32_t* addr);
-/** Implemented by the porting layer, this function subtracts 1 to the int
-    specified by the address (in a thread-safe manner), and returns the previous
-    value.
-*/
-SK_API int32_t sk_atomic_dec(int32_t* addr);
-
-#endif
-
 #ifdef SK_USE_POSIX_THREADS
 
 #include <pthread.h>
diff --git a/include/utils/SkCamera.h b/include/utils/SkCamera.h
index 57521b84cf..1c4c1fbd7e 100644
--- a/include/utils/SkCamera.h
+++ b/include/utils/SkCamera.h
@@ -152,6 +152,9 @@ public:
 
 #ifdef SK_BUILD_FOR_ANDROID
     void setCameraLocation(SkScalar x, SkScalar y, SkScalar z);
+    SkScalar getCameraLocationX();
+    SkScalar getCameraLocationY();
+    SkScalar getCameraLocationZ();
 #endif
 
     void getMatrix(SkMatrix*) const;