GYP changes and scripts for compiling Skia for ChromeOS

platform_tools/chromeos/gyp/dependencies.gypi

Index: platform_tools/chromeos/gyp/dependencies.gypi
===================================================================
--- platform_tools/chromeos/gyp/dependencies.gypi	(revision 0)
+++ platform_tools/chromeos/gyp/dependencies.gypi	(working copy)
@@ -1,12 +1,6 @@
-# This GYP file stores the dependencies necessary to build Skia on the Android
+# This GYP file stores the dependencies necessary to build Skia on the Chrome OS
 # platform. The OS doesn't provide many stable libraries as part of the
 # distribution so we have to build a few of them ourselves.
-#
-# NOTE: We tried adding the gyp file to the android/ directory at the root of
-# the Skia repo, but that resulted in the generated makefiles being created
-# outside of the out directory. We may be able to move the bulk of this gyp
-# to the /android directory and put a simple shim here, but that has yet to be
-# tested.
 
 {
   'variables': {
@@ -14,44 +8,6 @@
   },
   'targets': [
     {
-      'target_name': 'cpu_features',
-      'type': 'static_library',
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/cpufeatures',
-        ],
-      },
-      'sources': [
-        '../third_party/cpufeatures/cpu-features.c',
-        '../third_party/cpufeatures/cpu-features.h',
-      ],
-    },
-    {
-      'target_name': 'expat',
-      'type': 'static_library',
-      'sources': [
-        '../third_party/externals/expat/lib/xmlparse.c',
-        '../third_party/externals/expat/lib/xmlrole.c',
-        '../third_party/externals/expat/lib/xmltok.c',
-      ],
-      'include_dirs': [
-        '../third_party/externals/expat',
-        '../third_party/externals/expat/lib',
-      ],
-      'cflags': [
-        '-Wall',
-        '-Wmissing-prototypes',
-        '-Wstrict-prototypes',
-        '-fexceptions',
-        '-DHAVE_EXPAT_CONFIG_H',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/externals/expat/lib',  # For expat.h
-        ],
-      }
-    },
-    {
       'target_name': 'gif',

[tfarina, 2013/07/13 03:56:57]

how this is compiling on Linux?

$ ninja -C out/Debug

[6/571] CXX obj/src/images/images.SkImageDecoder_libgif.o
FAILED: clang++ -MMD -MF obj/src/images/images.SkImageDecoder_libgif.o.d
-DSK_GAMMA_SRGB -DSK_GAMMA_APPLY_TO_A8 -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1
-DSK_SCALAR_IS_FLOAT -DSK_CAN_USE_FLOAT -DSK_SUPPORT_GPU=1 -DSK_SAMPLES_FOR_X
-DSK_BUILD_FOR_UNIX -DSK_USE_POSIX_THREADS -DSK_DEBUG -DGR_DEBUG=1
-DSK_DEVELOPER=1 -I/usr/include/freetype2 -I../../include/config
-I../../include/core -I../../include/images -I../../include/lazy
-I../../src/core -I../../src/image -I../../third_party/externals/libjpeg
-I../../third_party/externals/libwebp/src -I../../include/utils -Werror -Wall
-Wextra -Wno-unused-parameter -Wno-c++11-extensions -m64 -g   -c
../../src/images/SkImageDecoder_libgif.cpp -o
obj/src/images/images.SkImageDecoder_libgif.o
../../src/images/SkImageDecoder_libgif.cpp:17:10: fatal error: 'gif_lib.h' file
not found
#include "gif_lib.h"
         ^
1 error generated.

[djsollen, 2013/07/15 11:59:44]

This file is only related to ChromeOS.  For that standard linux build see
trunk/gyp/images.gyp and you will find that on linux we expect the host OS to
have installed gifn development libs and we just link using -lgif.

       'type': 'static_library',
       'sources': [
@@ -75,177 +31,5 @@
         ],
       }
     },
-    {
-      'target_name': 'png',
-      'type': 'static_library',
-      'sources': [
-        '../third_party/externals/png/png.c',
-        '../third_party/externals/png/pngerror.c',
-        '../third_party/externals/png/pnggccrd.c',
-        '../third_party/externals/png/pngget.c',
-        '../third_party/externals/png/pngmem.c',
-        '../third_party/externals/png/pngpread.c',
-        '../third_party/externals/png/pngread.c',
-        '../third_party/externals/png/pngrio.c',
-        '../third_party/externals/png/pngrtran.c',
-        '../third_party/externals/png/pngrutil.c',
-        '../third_party/externals/png/pngset.c',
-        '../third_party/externals/png/pngtrans.c',
-        '../third_party/externals/png/pngvcrd.c',
-        '../third_party/externals/png/pngwio.c',
-        '../third_party/externals/png/pngwrite.c',
-        '../third_party/externals/png/pngwtran.c',
-        '../third_party/externals/png/pngwutil.c',
-      ],
-      'include_dirs': [
-        '../third_party/externals/png',
-      ],
-      'cflags': [
-        '-fvisibility=hidden',
-      ],
-      'cflags!': [
-        '-Wall',
-      ],
-      'link_settings': {
-        'libraries': [
-          '-lz',
-        ],
-      },
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/externals/png',
-        ],
-      }
-    },
-    {
-      'target_name': 'jpeg',
-      'type': 'static_library',
-      'sources': [
-        '../third_party/externals/jpeg/jcapimin.c',
-        '../third_party/externals/jpeg/jcapistd.c',
-        '../third_party/externals/jpeg/jccoefct.c',
-        '../third_party/externals/jpeg/jccolor.c',
-        '../third_party/externals/jpeg/jcdctmgr.c',
-        '../third_party/externals/jpeg/jchuff.c',
-        '../third_party/externals/jpeg/jcinit.c',
-        '../third_party/externals/jpeg/jcmainct.c',
-        '../third_party/externals/jpeg/jcmarker.c',
-        '../third_party/externals/jpeg/jcmaster.c',
-        '../third_party/externals/jpeg/jcomapi.c',
-        '../third_party/externals/jpeg/jcparam.c',
-        '../third_party/externals/jpeg/jcphuff.c',
-        '../third_party/externals/jpeg/jcprepct.c',
-        '../third_party/externals/jpeg/jcsample.c',
-        '../third_party/externals/jpeg/jctrans.c',
-        '../third_party/externals/jpeg/jdapimin.c',
-        '../third_party/externals/jpeg/jdapistd.c',
-        '../third_party/externals/jpeg/jdatadst.c',
-        '../third_party/externals/jpeg/jdatasrc.c',
-        '../third_party/externals/jpeg/jdcoefct.c',
-        '../third_party/externals/jpeg/jdcolor.c',
-        '../third_party/externals/jpeg/jddctmgr.c',
-        '../third_party/externals/jpeg/jdhuff.c',
-        '../third_party/externals/jpeg/jdinput.c',
-        '../third_party/externals/jpeg/jdmainct.c',
-        '../third_party/externals/jpeg/jdmarker.c',
-        '../third_party/externals/jpeg/jdmaster.c',
-        '../third_party/externals/jpeg/jdmerge.c',
-        '../third_party/externals/jpeg/jdphuff.c',
-        '../third_party/externals/jpeg/jdpostct.c',
-        '../third_party/externals/jpeg/jdsample.c',
-        '../third_party/externals/jpeg/jdtrans.c',
-        '../third_party/externals/jpeg/jerror.c',
-        '../third_party/externals/jpeg/jfdctflt.c',
-        '../third_party/externals/jpeg/jfdctfst.c',
-        '../third_party/externals/jpeg/jfdctint.c',
-        '../third_party/externals/jpeg/jidctflt.c',
-        '../third_party/externals/jpeg/jidctfst.c',
-        '../third_party/externals/jpeg/jidctint.c',
-        '../third_party/externals/jpeg/jidctred.c',
-        '../third_party/externals/jpeg/jquant1.c',
-        '../third_party/externals/jpeg/jquant2.c',
-        '../third_party/externals/jpeg/jutils.c',
-        '../third_party/externals/jpeg/jmemmgr.c',
-        '../third_party/externals/jpeg/jmem-android.c', # ashmem is also available
-      ],
-      'include_dirs': [
-        '../third_party/externals/jpeg',
-      ],
-      'cflags': [
-        '-fvisibility=hidden',
-        '-DAVOID_TABLES',
-        '-O3',
-        '-fstrict-aliasing',
-        '-fprefetch-loop-arrays',
-        '-DANDROID_TILE_BASED_DECODE',
-      ],
-      'cflags!': [
-        '-Wall',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/externals/jpeg',
-        ],
-      }
-    },
-    {
-      # This target is a dependency for all console-type Skia applications which
-      # will run on Android.  Since Android requires us to load native code in
-      # shared libraries, we need a common entry point to wrap around main().
-      # Here we also change the type of all would-be executables to be shared
-      # libraries.  The alternative would be to introduce a condition in every
-      # executable target which changes to a shared library if the target OS is
-      # Android.  This is nicer because the switch is in one place.
-      'target_name': 'Android_EntryPoint',
-      'type': 'static_library',
-      'direct_dependent_settings': {
-        'target_conditions': [
-          # '_type' is an 'automatic variable' which is defined for any
-          # target which defines a key-value pair with 'type' as the key (so,
-          # all of them).  Conditionals inside 'target_conditions' are evaluated
-          # *after* all other definitions and conditionals are evaluated, so
-          # we're guaranteed that '_type' will be defined when we get here.
-          # For more info, see:
-          # - http://code.google.com/p/gyp/wiki/InputFormatReference#Variables
-          # - http://codereview.appspot.com/6353065/
-          ['_type == "executable"', {
-            'type': 'shared_library',
-          }],
-        ],
-      },
-      'sources': [
-        '../app/jni/com_skia_SkiaIntentService.cpp',
-      ],
-    },
-    {
-      # This target is a dependency for Skia Sample application which runs on
-      # Android.  Since Android requires us to load native code in shared
-      # libraries, we need a common entry point to wrap around main(). Here
-      # we also change the type of all would-be executables to be shared
-      # libraries.  The alternative would be to introduce a condition in every
-      # executable target which changes to a shared library if the target OS is
-      # Android.  This is nicer because the switch is in one place.
-      'target_name': 'Android_SampleApp',
-      'type': 'static_library',
-      'direct_dependent_settings': {
-        'target_conditions': [
-          # '_type' is an 'automatic variable' which is defined for any
-          # target which defines a key-value pair with 'type' as the key (so,
-          # all of them).  Conditionals inside 'target_conditions' are evaluated
-          # *after* all other definitions and conditionals are evaluated, so
-          # we're guaranteed that '_type' will be defined when we get here.
-          # For more info, see:
-          # - http://code.google.com/p/gyp/wiki/InputFormatReference#Variables
-          # - http://codereview.appspot.com/6353065/
-          ['_type == "executable"', {
-            'type': 'shared_library',
-          }],
-        ],
-        'sources': [
-          '../app/jni/com_skia_SkiaSampleRenderer.cpp',
-        ],
-      },
-
-    },
   ]
 }