Move SkBitmapRegionDecoder to include/android and src/android

gyp/tools.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
     # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
     {
       # Build all executable targets defined below.
       'target_name': 'tools',
       'type': 'none',
       'dependencies': [
-        'bitmap_region_decoder',
         'chrome_fuzz',
         'filter',
         'gpuveto',
         'imgblur',
         'imgconv',
         'imgslice',
         'lua_app',
         'lua_pictures',
         'pinspect',
         'render_pdfs',
@@ skipping 10 matching lines @@
         ['skia_shared_lib',
           {
             'dependencies': [
               'sklua', # This can only be built if skia is built as a shared library
             ],
           },
         ],
       ],
     },
     {
-      'target_name': 'bitmap_region_decoder',
-      'type': 'static_library',
-      'sources': [
-        '../tools/android/SkBitmapRegionCanvas.cpp',
-        '../tools/android/SkBitmapRegionCodec.cpp',
-        '../tools/android/SkBitmapRegionDecoder.cpp',
-      ],
-      'include_dirs': [
-        '../include/private',
-        '../src/codec',
-      ],
-      'dependencies': [
-        'skia_lib.gyp:skia_lib',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../tools/android',
-        ],
-      },
-    },
-    {
       'target_name': 'chrome_fuzz',
       'type': 'executable',
       'sources': [
         '../tools/chrome_fuzz.cpp',
       ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
@@ skipping 498 matching lines @@
       ],
     },
     {
       'target_name': 'test_public_includes',
       'type': 'static_library',
       # Ensure that our public headers don't have unused params so that clients
       # (e.g. Android) that include us can build with these warnings enabled
       'cflags!': [ '-Wno-unused-parameter' ],
       'variables': {
         'includes_to_test': [
+          '<(skia_include_path)/android',
           '<(skia_include_path)/animator',
           '<(skia_include_path)/c',
           '<(skia_include_path)/codec',
           '<(skia_include_path)/config',
           '<(skia_include_path)/core',
           '<(skia_include_path)/effects',
           '<(skia_include_path)/gpu',
           '<(skia_include_path)/images',
           '<(skia_include_path)/pathops',
           '<(skia_include_path)/pipe',
@@ skipping 138 matching lines @@
               'flags.gyp:flags',
               'skia_lib.gyp:skia_lib',
               'resources',
             ],
           },
         ],
       },
     ],
   ],
 }