revert 5681

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

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index e384e13bfab1bbd92fe9f8a29e52a1070545d0e9..e54dbe0b37fca78f3109f8f6123549757e26f956 100644 (file)
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -101,6 +101,7 @@
         '../samplecode/SampleTypeface.cpp',
         '../samplecode/SampleUnitMapper.cpp',
         '../samplecode/SampleVertices.cpp',
+        '../samplecode/SampleXfermodes.cpp',
         '../samplecode/SampleXfermodesBlur.cpp',
         '../samplecode/TransitionView.cpp',
         '../samplecode/TransitionView.h',

diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 7dd5e3d890ac9f81b3da2556878d8ac4b36bb5d4..b59bd117794c52de0b84b9ba12d498dab2b3bf62 100644 (file)
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -85,7 +85,7 @@
       'skia_nacl%': 0,
       'skia_gpu%': 1,
       'ios_sdk_version%': '5.1',
-      'skia_osx_sdkroot%': 'macosx10.8',
+      'skia_osx_sdkroot%': 'macosx10.6',
     },
 
     # Re-define all variables defined within the level-2 'variables' dict,

diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi
index 4044bb252b90052727a971a552c3795fc7e847fb..003cb054646956806ae25f4f349af9f068589b2a 100644 (file)
--- a/gyp/gmslides.gypi
+++ b/gyp/gmslides.gypi
@@ -1,7 +1,6 @@
 # include this gypi to include all the golden master slides.
 {
   'sources': [
-    '../gm/techtalk1.cpp',
     '../gm/aaclip.cpp',
     '../gm/aarectmodes.cpp',
     '../gm/arithmode.cpp',