Move SkBitSet to utils.
Review URL: https://codereview.appspot.com/5875043
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3460 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/pdf.gyp b/pdf.gyp
index 0d5fef5..bb42f00 100644
--- a/pdf.gyp
+++ b/pdf.gyp
@@ -3,14 +3,20 @@
{
'target_name': 'pdf',
'type': 'static_library',
+ 'dependencies': [
+ 'core.gyp:core',
+ 'ports.gyp:ports',
+ 'utils.gyp:utils',
+ 'zlib.gyp:zlib',
+ ],
'include_dirs': [
'../include/config',
'../include/core',
'../include/pdf',
'../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h
+ '../src/utils', # needed to get SkBitSet.h
],
'sources': [
- '../include/pdf/SkBitSet.h',
'../include/pdf/SkPDFCatalog.h',
'../include/pdf/SkPDFDevice.h',
'../include/pdf/SkPDFDocument.h',
@@ -24,7 +30,6 @@
'../include/pdf/SkPDFTypes.h',
'../include/pdf/SkPDFUtils.h',
- '../src/pdf/SkBitSet.cpp',
'../src/pdf/SkPDFCatalog.cpp',
'../src/pdf/SkPDFDevice.cpp',
'../src/pdf/SkPDFDocument.cpp',
@@ -49,9 +54,6 @@
'../include/pdf',
],
},
- 'dependencies': [
- 'zlib.gyp:zlib',
- ],
},
],
}
diff --git a/tests.gyp b/tests.gyp
index 2492274..541db7f 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -11,6 +11,7 @@
'../src/core',
'../src/effects',
'../src/gpu',
+ '../src/utils',
],
'sources': [
'../tests/AAClipTest.cpp',
diff --git a/utils.gyp b/utils.gyp
index 1847e95..e30b433 100644
--- a/utils.gyp
+++ b/utils.gyp
@@ -37,6 +37,8 @@
'../src/utils/SkBase64.cpp',
'../src/utils/SkBase64.h',
+ '../src/utils/SkBitSet.cpp',
+ '../src/utils/SkBitSet.h',
'../src/utils/SkBoundaryPatch.cpp',
'../src/utils/SkCamera.cpp',
'../src/utils/SkColorMatrix.cpp',
diff --git a/xps.gyp b/xps.gyp
index 8090166..5249c16 100644
--- a/xps.gyp
+++ b/xps.gyp
@@ -7,12 +7,12 @@
'core.gyp:core',
'images.gyp:images',
'utils.gyp:utils',
- 'pdf.gyp:pdf', # needed to get SkBitSet
],
'include_dirs': [
'../include/device/xps',
'../include/utils/win',
'../src/core', # needed to get SkGlyphCache.h
+ '../src/utils', # needed to get SkBitSet.h
],
'sources': [
'../include/device/xps/SkConstexprMath.h',
