commit ec1a7fa3041944f7c951971f826d82ec05d31b60
author vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 21 23:11:46 2012 +0000
committer vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 21 23:11:46 2012 +0000
tree 1a5a7f2d5edb4cf06a7c99974626a20055752623
parent cbd76ae138c4f34cd272ee9c0ac4facbe90fed90

Move SkBitSet to utils.

Review URL: https://codereview.appspot.com/5875043

git-svn-id: http://skia.googlecode.com/svn/trunk@3460 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/pdf.gyp

diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index 0d5fef5..bb42f00 100644
--- a/gyp/pdf.gyp
+++ b/gyp/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',
-      ],
     },
   ],
 }

gyp/tests.gyp

diff --git a/gyp/tests.gyp b/gyp/tests.gyp
index 2492274..541db7f 100644
--- a/gyp/tests.gyp
+++ b/gyp/tests.gyp
@@ -11,6 +11,7 @@
         '../src/core',
         '../src/effects',
         '../src/gpu',
+        '../src/utils',
       ],
       'sources': [
         '../tests/AAClipTest.cpp',

gyp/utils.gyp

diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 1847e95..e30b433 100644
--- a/gyp/utils.gyp
+++ b/gyp/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',

gyp/xps.gyp

diff --git a/gyp/xps.gyp b/gyp/xps.gyp
index 8090166..5249c16 100644
--- a/gyp/xps.gyp
+++ b/gyp/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',

src/utils/SkBitSet.cpp

diff --git a/src/pdf/SkBitSet.cpp b/src/utils/SkBitSet.cpp
similarity index 100%
rename from src/pdf/SkBitSet.cpp
rename to src/utils/SkBitSet.cpp

src/utils/SkBitSet.h

diff --git a/include/pdf/SkBitSet.h b/src/utils/SkBitSet.h
similarity index 100%
rename from include/pdf/SkBitSet.h
rename to src/utils/SkBitSet.h