Add samples to Viewer.

gyp/viewer.gyp

Index: gyp/viewer.gyp
diff --git a/gyp/viewer.gyp b/gyp/viewer.gyp
index 1013e070ae0c9bd043c3100232e8a08bd8edd317..94271822a79811089b223bceab64f2ef9432142c 100644
--- a/gyp/viewer.gyp
+++ b/gyp/viewer.gyp
@@ -17,27 +17,150 @@
       ],
       'include_dirs': [
         '../bench',
+	'../experimental',
         '../gm',
         '../include/views',
         '../include/private',
+	'../samplecode',
         '../src/core',
         '../src/effects',
         '../src/gpu',
-        '../src/images',
         '../src/image',
+        '../src/images',
+        '../src/pathops',
         '../src/views/unix',
         '../tools/timer',
+	'../tools',
       ],
       'sources': [
         '../gm/gm.cpp',
+        '<!@(python find.py ../tools/viewer "*.cpp")',
+
+        # Samples

[djsollen, 2016/06/15 17:17:58]

can you put these in their own gypi file that is shared by viewer and sampleApp?

[jvanverth1, 2016/06/16 16:39:41]

Done.

+        '../samplecode/GMSampleView.h',
+        '../samplecode/GMSampleView.cpp',
+        '../samplecode/ClockFaceView.cpp',
+        '../samplecode/OverView.cpp',
+        '../samplecode/OverView.h',
+        '../samplecode/PerlinPatch.cpp',
+        '../samplecode/Sample2PtRadial.cpp',
+        '../samplecode/SampleAAClip.cpp',
+        '../samplecode/SampleAAGeometry.cpp',
+        '../samplecode/SampleAARects.cpp',
+        '../samplecode/SampleAARectModes.cpp',
+        '../samplecode/SampleAll.cpp',
+        '../samplecode/SampleAnimatedText.cpp',
+        '../samplecode/SampleAnimBlur.cpp',
+        '../samplecode/SampleArc.cpp',
+        '../samplecode/SampleAtlas.cpp',
+        '../samplecode/SampleBigBlur.cpp',
+        '../samplecode/SampleBigGradient.cpp',
+        '../samplecode/SampleBitmapRect.cpp',
+        '../samplecode/SampleBlur.cpp',
+        '../samplecode/SampleCamera.cpp',
+        '../samplecode/SampleChart.cpp',
+        '../samplecode/SampleCircle.cpp',
+        '../samplecode/SampleClip.cpp',
+        '../samplecode/SampleClipDrawMatch.cpp',
+        '../samplecode/SampleClock.cpp',
+        '../samplecode/SampleCode.cpp',
+        '../samplecode/SampleCode.h',
+        '../samplecode/SampleColorFilter.cpp',
+        '../samplecode/SampleComplexClip.cpp',
+        '../samplecode/SampleConcavePaths.cpp',
+        '../samplecode/SampleDegenerateTwoPtRadials.cpp',
+        '../samplecode/SampleDither.cpp',
+        '../samplecode/SampleDitherBitmap.cpp',
+        '../samplecode/SampleEffects.cpp',
+        '../samplecode/SampleEmboss.cpp',
+        '../samplecode/SampleFatBits.cpp',
+        '../samplecode/SampleFillType.cpp',
+        '../samplecode/SampleFilter.cpp',
+        '../samplecode/SampleFilter2.cpp',
+        '../samplecode/SampleFilterQuality.cpp',
+        '../samplecode/SampleFilterFuzz.cpp',
+        '../samplecode/SampleFontCache.cpp',
+        '../samplecode/SampleFontScalerTest.cpp',
+        '../samplecode/SampleFuzz.cpp',
+        '../samplecode/SampleGradients.cpp',
+        '../samplecode/SampleHairCurves.cpp',
+        '../samplecode/SampleHairline.cpp',
+        '../samplecode/SampleHairModes.cpp',
+        '../samplecode/SampleHT.cpp',
+        '../samplecode/SampleIdentityScale.cpp',
+        '../samplecode/SampleLayerMask.cpp',
+        '../samplecode/SampleLayers.cpp',
+        '../samplecode/SampleLCD.cpp',
+        '../samplecode/SampleLighting.cpp',
+        '../samplecode/SampleLines.cpp',
+        '../samplecode/SampleLitAtlas.cpp',
+        '../samplecode/SampleLua.cpp',
+        '../samplecode/SampleManyRects.cpp',
+        '../samplecode/SampleMeasure.cpp',
+        '../samplecode/SampleMegaStroke.cpp',
+        '../samplecode/SamplePatch.cpp',
+        '../samplecode/SamplePath.cpp',
+        '../samplecode/SamplePathClip.cpp',
+        '../samplecode/SamplePathFuzz.cpp',
+        '../samplecode/SamplePathEffects.cpp',
+        '../samplecode/SamplePictFile.cpp',
+        '../samplecode/SamplePoints.cpp',
+        '../samplecode/SamplePolyToPoly.cpp',
+        '../samplecode/SampleQuadStroker.cpp',
+        '../samplecode/SampleRectanizer.cpp',
+        '../samplecode/SampleRegion.cpp',
+        '../samplecode/SampleRepeatTile.cpp',
+        '../samplecode/SampleShaders.cpp',
+        '../samplecode/SampleShaderText.cpp',
+        '../samplecode/SampleShip.cpp',
+        '../samplecode/SampleSkLayer.cpp',
+        '../samplecode/SampleSlides.cpp',
+        '../samplecode/SampleStringArt.cpp',
+        '../samplecode/SampleStrokePath.cpp',
+        '../samplecode/SampleSubpixelTranslate.cpp',
+        '../samplecode/SampleText.cpp',
+        '../samplecode/SampleTextAlpha.cpp',
+        '../samplecode/SampleTextBox.cpp',
+        '../samplecode/SampleTextOnPath.cpp',
+        '../samplecode/SampleTextureDomain.cpp',
+        '../samplecode/SampleTiling.cpp',
+        '../samplecode/SampleTinyBitmap.cpp',
+        '../samplecode/SampleUnpremul.cpp',
+        '../samplecode/SampleVertices.cpp',
+        '../samplecode/SampleXfermodesBlur.cpp',
+        '../samplecode/SampleXfer.cpp',
+	
+        # PerlinNoise2
+        '../experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp',
+        '../experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h',
+
+	# Lua
+        '../src/utils/SkLuaCanvas.cpp',
+        '../src/utils/SkLua.cpp',
+
+        # views (subset of files for the Android build)
+        '../src/views/SkEvent.cpp',
+        '../src/views/SkEventSink.cpp',
+        '../src/views/SkOSMenu.cpp',
+        '../src/views/SkTagList.cpp',
+        '../src/views/SkTagList.h',
         '../src/views/SkTouchGesture.cpp',
+        '../src/views/SkView.cpp',
+        '../src/views/SkViewPriv.cpp',
+        '../src/views/SkViewPriv.h',
         '../src/views/unix/keysym2ucs.c',
-        '<!@(python find.py ../tools/viewer "*.cpp")',
       ],
+      'sources!': [
+        '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile
+        '../samplecode/SampleFontCache.cpp', #relies on pthread.h
+      ],      
       'dependencies': [
+        'experimental.gyp:experimental',
         'flags.gyp:flags',
         'gputest.gyp:skgputest',
         'jsoncpp.gyp:jsoncpp',
+	'lua.gyp:lua',
+        'pdf.gyp:pdf',
         'skia_lib.gyp:skia_lib',
         'tools.gyp:crash_handler',
         'tools.gyp:proc_stats',
@@ -45,6 +168,7 @@
         'tools.gyp:sk_tool_utils',
         'tools.gyp:timer',
         'tools.gyp:url_data_manager',
+	'xml.gyp:xml',
       ],
       'conditions' : [
         [ 'skia_os == "android"', {
@@ -66,11 +190,16 @@
           },
         }],
         ['skia_os != "android"', {
-          'sources/': [ ['exclude', '_android.(h|cpp)$'],
+          'sources/': [
+            ['exclude', '_android.(h|cpp)$'],
+            ['exclude', 'src/views'],
+          ],
+          'dependencies': [
+            'views.gyp:views',

[djsollen, 2016/06/15 17:17:58]

can you add a comment explaining why android need views but no one else does?

[jvanverth1, 2016/06/15 17:41:27]

It's the other way around (others can use views.gyp but Android can't), but yes,
I can.

[jvanverth1, 2016/06/16 16:39:41]

Done.

           ],
         }],
         ['skia_os != "linux"', {
-          'sources/': [ 
+          'sources/': [
             ['exclude', '_unix.(h|cpp)$'],
             ['exclude', 'keysym2ucs.c'],
           ],