Have /src files use header directly.
BUG=skia:
Review URL: https://codereview.chromium.org/1373253003
diff --git a/gyp/views.gyp b/gyp/views.gyp
index e7abc54..83ce377 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -20,6 +20,7 @@
'xml.gyp:xml',
],
'include_dirs': [
+ '../include/private',
'../include/views',
'../include/views/unix',
'../src/gpu',
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index a54f0ff..bbd1f55 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -7,7 +7,7 @@
*/
#include "SkAAClip.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkBlitter.h"
#include "SkColorPriv.h"
#include "SkPath.h"
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index a935e88..6fd97dc 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkBitmap.h"
#include "SkColorPriv.h"
#include "SkData.h"
diff --git a/src/core/SkBitmapHeap.h b/src/core/SkBitmapHeap.h
index d273a29..22c31a0 100644
--- a/src/core/SkBitmapHeap.h
+++ b/src/core/SkBitmapHeap.h
@@ -8,7 +8,7 @@
#ifndef SkBitmapHeap_DEFINED
#define SkBitmapHeap_DEFINED
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkBitmap.h"
#include "SkPoint.h"
#include "SkRefCnt.h"
diff --git a/src/core/SkClipStack.cpp b/src/core/SkClipStack.cpp
index 1fd621b..f54d57f 100644
--- a/src/core/SkClipStack.cpp
+++ b/src/core/SkClipStack.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkCanvas.h"
#include "SkClipStack.h"
#include "SkPath.h"
diff --git a/src/core/SkDrawable.cpp b/src/core/SkDrawable.cpp
index c998d02..8fea38b 100644
--- a/src/core/SkDrawable.cpp
+++ b/src/core/SkDrawable.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkCanvas.h"
#include "SkDrawable.h"
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 0fe3ae4..8247336 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkMessageBus.h"
#include "SkPicture.h"
#include "SkPictureData.h"
diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp
index aeebec4..3a542c6 100644
--- a/src/core/SkRegion.cpp
+++ b/src/core/SkRegion.cpp
@@ -7,7 +7,7 @@
*/
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkRegionPriv.h"
#include "SkTemplates.h"
#include "SkUtils.h"
diff --git a/src/core/SkRegionPriv.h b/src/core/SkRegionPriv.h
index bde8e28..160c55d 100644
--- a/src/core/SkRegionPriv.h
+++ b/src/core/SkRegionPriv.h
@@ -11,7 +11,7 @@
#define SkRegionPriv_DEFINED
#include "SkRegion.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#define assert_sentinel(value, isSentinel) \
SkASSERT(((value) == SkRegion::kRunTypeSentinel) == isSentinel)
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index 84ce8b6..6aadb43 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkBitmapProcShader.h"
#include "SkColorShader.h"
#include "SkEmptyShader.h"
diff --git a/src/core/SkSharedMutex.cpp b/src/core/SkSharedMutex.cpp
index 0db6101..203a775 100644
--- a/src/core/SkSharedMutex.cpp
+++ b/src/core/SkSharedMutex.cpp
@@ -7,7 +7,7 @@
#include "SkSharedMutex.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkTypes.h"
#include "../private/SkSemaphore.h"
diff --git a/src/core/SkSharedMutex.h b/src/core/SkSharedMutex.h
index 737735f..9660adf 100644
--- a/src/core/SkSharedMutex.h
+++ b/src/core/SkSharedMutex.h
@@ -8,7 +8,7 @@
#ifndef SkSharedLock_DEFINED
#define SkSharedLock_DEFINED
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkSemaphore.h"
#include "SkTypes.h"
diff --git a/src/core/SkString.cpp b/src/core/SkString.cpp
index af5fa7a..d93f662 100644
--- a/src/core/SkString.cpp
+++ b/src/core/SkString.cpp
@@ -7,7 +7,7 @@
*/
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkFixed.h"
#include "SkString.h"
#include "SkUtils.h"
diff --git a/src/core/SkTLS.cpp b/src/core/SkTLS.cpp
index c7304ed..a47dc14 100755
--- a/src/core/SkTLS.cpp
+++ b/src/core/SkTLS.cpp
@@ -12,7 +12,7 @@
#ifdef SK_TRACE_TLS_LIFETIME
- #include "../private/SkAtomics.h"
+ #include "SkAtomics.h"
static int32_t gTLSRecCount;
#endif
diff --git a/src/core/SkTaskGroup.h b/src/core/SkTaskGroup.h
index c23087b..3af64d7 100644
--- a/src/core/SkTaskGroup.h
+++ b/src/core/SkTaskGroup.h
@@ -9,7 +9,7 @@
#define SkTaskGroup_DEFINED
#include "SkTypes.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkTemplates.h"
struct SkRunnable;
diff --git a/src/core/SkTraceEvent.h b/src/core/SkTraceEvent.h
index c76e046..05dc340 100644
--- a/src/core/SkTraceEvent.h
+++ b/src/core/SkTraceEvent.h
@@ -10,7 +10,7 @@
#ifndef SkTraceEvent_DEFINED
#define SkTraceEvent_DEFINED
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkEventTracer.h"
#include "SkTraceEventCommon.h"
diff --git a/src/core/SkTypefaceCache.cpp b/src/core/SkTypefaceCache.cpp
index 3f8799d..5fe080d 100644
--- a/src/core/SkTypefaceCache.cpp
+++ b/src/core/SkTypefaceCache.cpp
@@ -9,7 +9,7 @@
#include "SkTypefaceCache.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkMutex.h"
#define TYPEFACE_CACHE_LIMIT 1024
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index 195a96c..bbcf182 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -8,7 +8,7 @@
#ifndef SkImage_Base_DEFINED
#define SkImage_Base_DEFINED
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkImage.h"
#include "SkSurface.h"
diff --git a/src/image/SkImage_Gpu.h b/src/image/SkImage_Gpu.h
index b8b7496..5e847dd 100644
--- a/src/image/SkImage_Gpu.h
+++ b/src/image/SkImage_Gpu.h
@@ -8,7 +8,7 @@
#ifndef SkImage_Gpu_DEFINED
#define SkImage_Gpu_DEFINED
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "GrTexture.h"
#include "GrGpuResourcePriv.h"
#include "SkBitmap.h"
diff --git a/src/utils/SkEventTracer.cpp b/src/utils/SkEventTracer.cpp
index 65fc24f..32a0207 100644
--- a/src/utils/SkEventTracer.cpp
+++ b/src/utils/SkEventTracer.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkEventTracer.h"
#include "SkOncePtr.h"
diff --git a/src/views/SkOSMenu.cpp b/src/views/SkOSMenu.cpp
index b120d96..ec92a7b 100644
--- a/src/views/SkOSMenu.cpp
+++ b/src/views/SkOSMenu.cpp
@@ -4,7 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
#include "SkOSMenu.h"
#include <stdarg.h>