summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/SkCanvas.h2
-rw-r--r--core/SkDevice.h2
-rw-r--r--core/SkDraw.h2
-rw-r--r--core/SkFontHost.h2
-rw-r--r--core/SkPaint.h4
-rw-r--r--core/SkPath.h6
-rw-r--r--core/SkPixelRef.h2
-rw-r--r--core/SkRegion.h2
-rw-r--r--core/SkTRegistry.h2
-rw-r--r--core/SkThread_platform.h2
-rw-r--r--core/SkUtils.h2
-rw-r--r--effects/SkPorterDuff.h2
-rw-r--r--gpu/GrConfig.h2
-rw-r--r--utils/SkCamera.h2
-rw-r--r--views/SkWindow.h2
15 files changed, 18 insertions, 18 deletions
diff --git a/core/SkCanvas.h b/core/SkCanvas.h
index f7f918e..d22fbd6 100644
--- a/core/SkCanvas.h
+++ b/core/SkCanvas.h
@@ -723,7 +723,7 @@ public:
const SkPath& path, const SkMatrix* matrix,
const SkPaint& paint);
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
/** Draw the text on path, with each character/glyph origin specified by the pos[]
array. The origin is interpreted by the Align setting in the paint.
@param text The text to be drawn
diff --git a/core/SkDevice.h b/core/SkDevice.h
index 488a004..6fe1c19 100644
--- a/core/SkDevice.h
+++ b/core/SkDevice.h
@@ -220,7 +220,7 @@ protected:
virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len,
const SkPath& path, const SkMatrix* matrix,
const SkPaint& paint);
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
virtual void drawPosTextOnPath(const SkDraw& draw, const void* text, size_t len,
const SkPoint pos[], const SkPaint& paint,
const SkPath& path, const SkMatrix* matrix);
diff --git a/core/SkDraw.h b/core/SkDraw.h
index 2ea0740..f1e126a 100644
--- a/core/SkDraw.h
+++ b/core/SkDraw.h
@@ -55,7 +55,7 @@ public:
int scalarsPerPosition, const SkPaint& paint) const;
void drawTextOnPath(const char text[], size_t byteLength,
const SkPath&, const SkMatrix*, const SkPaint&) const;
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
void drawPosTextOnPath(const char text[], size_t byteLength,
const SkPoint pos[], const SkPaint& paint,
const SkPath& path, const SkMatrix* matrix) const;
diff --git a/core/SkFontHost.h b/core/SkFontHost.h
index c32c3d5..1b18aba 100644
--- a/core/SkFontHost.h
+++ b/core/SkFontHost.h
@@ -278,7 +278,7 @@ public:
static void SetSubpixelOrder(LCDOrder order);
static LCDOrder GetSubpixelOrder();
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
///////////////////////////////////////////////////////////////////////////
/**
diff --git a/core/SkPaint.h b/core/SkPaint.h
index ee9b65c..eb5611b 100644
--- a/core/SkPaint.h
+++ b/core/SkPaint.h
@@ -818,7 +818,7 @@ public:
void getTextPath(const void* text, size_t length, SkScalar x, SkScalar y,
SkPath* path) const;
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
const SkGlyph& getUnicharMetrics(SkUnichar);
const void* findImage(const SkGlyph&);
@@ -854,7 +854,7 @@ private:
unsigned fStyle : 2;
unsigned fTextEncoding : 2; // 3 values
unsigned fHinting : 2;
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
uint32_t fGenerationID;
#endif
diff --git a/core/SkPath.h b/core/SkPath.h
index 5982ea0..8eedb46 100644
--- a/core/SkPath.h
+++ b/core/SkPath.h
@@ -13,7 +13,7 @@
#include "SkMatrix.h"
#include "SkTDArray.h"
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
#define GEN_ID_INC fGenerationID++
#define GEN_ID_PTR_INC(ptr) ptr->fGenerationID++
#else
@@ -646,7 +646,7 @@ public:
void flatten(SkWriter32&) const;
void unflatten(SkReader32&);
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
uint32_t getGenerationID() const;
#endif
@@ -660,7 +660,7 @@ private:
uint8_t fSegmentMask;
mutable uint8_t fBoundsIsDirty;
mutable uint8_t fConvexity;
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
uint32_t fGenerationID;
#endif
diff --git a/core/SkPixelRef.h b/core/SkPixelRef.h
index e5073af..7e21a43 100644
--- a/core/SkPixelRef.h
+++ b/core/SkPixelRef.h
@@ -124,7 +124,7 @@ public:
virtual Factory getFactory() const { return NULL; }
virtual void flatten(SkFlattenableWriteBuffer&) const;
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
/**
* Acquire a "global" ref on this object.
* The default implementation just calls ref(), but subclasses can override
diff --git a/core/SkRegion.h b/core/SkRegion.h
index 7942985..bbce882 100644
--- a/core/SkRegion.h
+++ b/core/SkRegion.h
@@ -283,7 +283,7 @@ public:
*/
bool op(const SkRegion& rgna, const SkRegion& rgnb, Op op);
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
/** Returns a new char* containing the list of rectangles in this region
*/
char* toString();
diff --git a/core/SkTRegistry.h b/core/SkTRegistry.h
index f655a43..34fcffd 100644
--- a/core/SkTRegistry.h
+++ b/core/SkTRegistry.h
@@ -21,7 +21,7 @@ public:
typedef T (*Factory)(P);
SkTRegistry(Factory fact) {
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
// work-around for double-initialization bug
{
SkTRegistry* reg = gHead;
diff --git a/core/SkThread_platform.h b/core/SkThread_platform.h
index 68c9c1f..2d94571 100644
--- a/core/SkThread_platform.h
+++ b/core/SkThread_platform.h
@@ -10,7 +10,7 @@
#ifndef SkThread_platform_DEFINED
#define SkThread_platform_DEFINED
-#if defined(ANDROID) && !defined(SK_BUILD_FOR_ANDROID_NDK)
+#if defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_ANDROID_NDK)
#include <utils/threads.h>
#include <utils/Atomic.h>
diff --git a/core/SkUtils.h b/core/SkUtils.h
index fb18d20..2e20107 100644
--- a/core/SkUtils.h
+++ b/core/SkUtils.h
@@ -32,7 +32,7 @@ void sk_memset32_portable(uint32_t dst[], uint32_t value, int count);
typedef void (*SkMemset32Proc)(uint32_t dst[], uint32_t value, int count);
SkMemset32Proc SkMemset32GetPlatformProc();
-#if defined(ANDROID) && !defined(SK_BUILD_FOR_ANDROID_NDK)
+#if defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_ANDROID_NDK)
#include "cutils/memory.h"
#define sk_memset16(dst, value, count) android_memset16(dst, value, (count) << 1)
diff --git a/effects/SkPorterDuff.h b/effects/SkPorterDuff.h
index 2d5bdb1..44d94f8 100644
--- a/effects/SkPorterDuff.h
+++ b/effects/SkPorterDuff.h
@@ -45,7 +45,7 @@ public:
kMultiply_Mode, //!< [Sa * Da, Sc * Dc]
kScreen_Mode, //!< [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc]
kAdd_Mode, //!< Saturate(S + D)
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
kOverlay_Mode,
#endif
diff --git a/gpu/GrConfig.h b/gpu/GrConfig.h
index 1d07af1..461dee7 100644
--- a/gpu/GrConfig.h
+++ b/gpu/GrConfig.h
@@ -61,7 +61,7 @@
#undef GR_IOS_BUILD
#define GR_IOS_BUILD 1
// #error "IOS"
- #elif (defined(ANDROID_NDK) && ANDROID_NDK) || defined(ANDROID)
+ #elif defined(SK_BUILD_FOR_ANDROID)
#undef GR_ANDROID_BUILD
#define GR_ANDROID_BUILD 1
// #error "ANDROID"
diff --git a/utils/SkCamera.h b/utils/SkCamera.h
index e82aaa1..57521b8 100644
--- a/utils/SkCamera.h
+++ b/utils/SkCamera.h
@@ -150,7 +150,7 @@ public:
void rotateY(SkScalar deg);
void rotateZ(SkScalar deg);
-#ifdef ANDROID
+#ifdef SK_BUILD_FOR_ANDROID
void setCameraLocation(SkScalar x, SkScalar y, SkScalar z);
#endif
diff --git a/views/SkWindow.h b/views/SkWindow.h
index eda928c..c72163c 100644
--- a/views/SkWindow.h
+++ b/views/SkWindow.h
@@ -108,7 +108,7 @@ private:
#include "SkOSWindow_Mac.h"
#elif defined(SK_BUILD_FOR_WIN)
#include "SkOSWindow_Win.h"
-#elif defined(ANDROID)
+#elif defined(SK_BUILD_FOR_ANDROID)
#include "SkOSWindow_Android.h"
#elif defined(SK_BUILD_FOR_UNIX)
#include "SkOSWindow_Unix.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 15:25:13 +0000