Revert "delete old things!"

This reverts commit 15b125d40122e966bd723d23e82c3224b1da4898.

NOTREECHECKS=true

original change breaks android tree

BUG=skia:

Review URL: https://codereview.chromium.org/848073005

3 files changed, 138 insertions, 0 deletions

diff --git a/gyp/gm.gyp b/gyp/gm.gyp
new file mode 100644
index 0000000000..658a0677c3
--- /dev/null
+++ b/gyp/gm.gyp
@@ -0,0 +1,100 @@
+# GYP file to build the "gm" (golden master) executable.
+{
+  'includes': [
+    'apptype_console.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'gm',
+      'type': 'executable',
+      'include_dirs' : [
+        '../src/core',
+        '../src/effects',
+        '../src/images',
+        '../src/pipe/utils',
+        '../src/utils',
+      ],
+      'includes': [
+        'gmslides.gypi',
+      ],
+      'sources': [
+        '../gm/gm.cpp',
+        '../gm/gmmain.cpp',
+        '../gm/system_preferences_default.cpp',
+
+        '../src/pipe/utils/SamplePipeControllers.h',
+        '../src/pipe/utils/SamplePipeControllers.cpp',
+      ],
+      'dependencies': [
+        'etc1.gyp:libetc1',
+        'flags.gyp:flags',
+        'jsoncpp.gyp:jsoncpp',
+        'pdf.gyp:pdf',
+        'skia_lib.gyp:skia_lib',
+        'tools.gyp:crash_handler',
+        'tools.gyp:gm_expectations',
+        'tools.gyp:proc_stats',
+        'tools.gyp:resources',
+        'tools.gyp:sk_tool_utils',
+      ],
+      'conditions': [
+        ['skia_android_framework', {
+          'libraries': [
+            '-lskia',
+          ],
+        }],
+        ['skia_run_pdfviewer_in_gm or skia_poppler_enabled', {
+          'sources': [
+            '../src/utils/SkPDFRasterizer.cpp',
+          ],
+        }],
+        ['skia_run_pdfviewer_in_gm', {
+          'defines': [
+            'SK_BUILD_NATIVE_PDF_RENDERER',
+          ],
+          'include_dirs' : [
+            '../experimental/PdfViewer/inc',
+          ],
+          'dependencies': [
+            'pdfviewer_lib.gyp:pdfviewer_lib',
+          ],
+        }],
+        ['skia_poppler_enabled', {
+          'dependencies': [
+            'poppler.gyp:*',
+          ],
+          'defines': [
+            'SK_BUILD_POPPLER',
+          ],
+        }],
+        ['skia_os == "mac"', {
+          'sources!': [
+            '../gm/system_preferences_default.cpp',
+          ],
+          'sources': [
+            '../gm/system_preferences_mac.mm',
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+              '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+            ],
+          },
+        }],
+        ['skia_os == "win"', {
+          'dependencies': [
+            'xps.gyp:xps',
+          ],
+        }],
+        ['skia_gpu == 1', {
+          'include_dirs': [
+            '../src/gpu',
+          ],
+          'dependencies': [
+            'gputest.gyp:skgputest',
+          ],
+        }],
+      ],
+    },
+  ],
+}
diff --git a/gyp/most.gyp b/gyp/most.gyp
index b94bda4e82..e22629ae74 100644
--- a/gyp/most.gyp
+++ b/gyp/most.gyp
@@ -16,6 +16,7 @@
         'skia_lib.gyp:skia_lib',
 
         'bench.gyp:*',
+        'gm.gyp:gm',
         'SampleApp.gyp:SampleApp',
         'tools.gyp:tools',
         'pathops_unittest.gyp:*',
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 7c3cc2a217..13416664fc 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -13,6 +13,7 @@
       'target_name': 'tools',
       'type': 'none',
       'dependencies': [
+        'bbh_shootout',
         'bench_pictures',
         'dump_record',
         'filter',
@@ -42,6 +43,22 @@
       ],
     },
     {
+      'target_name': 'gm_expectations',
+      'type': 'static_library',
+      'include_dirs' : [ '../src/utils/' ],
+      'sources': [
+        '../gm/gm_expectations.cpp',
+      ],
+      'dependencies': [
+        'jsoncpp.gyp:jsoncpp',
+        'sk_tool_utils',
+        'skia_lib.gyp:skia_lib',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [ '../gm/' ],
+      },
+    },
+    {
       'target_name': 'crash_handler',
         'type': 'static_library',
         'sources': [ '../tools/CrashHandler.cpp' ],
@@ -540,6 +557,26 @@
       ],
     },
     {
+      'target_name': 'bbh_shootout',
+      'type': 'executable',
+      'include_dirs': [
+        '../bench',
+        '../tools/'
+      ],
+      'sources': [
+        '../tools/bbh_shootout.cpp',
+
+        # Bench code:
+      ],
+      'dependencies': [
+        'timer',
+        'flags.gyp:flags',
+        'skia_lib.gyp:skia_lib',
+        'tools.gyp:picture_renderer',
+        'tools.gyp:picture_utils',
+      ],
+    },
+    {
       'target_name': 'filter',
       'type': 'executable',
       'include_dirs' : [