Move SkBitmapRegionDecoder to include/android and src/android

gyp/bench.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'include_dirs': [
     '../bench/subset',
     '../bench',
     '../include/private',
+    '../src/android',

[mtklein, 2015/11/11 22:24:21]

Probably not needed now that this API is in include/?

[msarett, 2015/11/11 22:33:14]

In all three cases it is needed.

get_scale_from_sample_size() is defined in SkBitmapRegionDecoderPriv.h is used
in DM and nanobench.  Amusingly, it is not used in src/android.  It is also used
in src/codec (which happens to have its own identical version of this function
in src/codec/SkCodecPriv.h).

We probably want to put it in one place where it can be accessed everywhere. 
Any suggestions?

     '../src/core',
     '../src/effects',
     '../src/gpu',
     '../src/utils',
   ],
   'sources': [ '<!@(python find.py ../bench "*.cpp")' ],
 
   'dependencies': [
     'etc1.gyp:libetc1',
     'skia_lib.gyp:skia_lib',
-    'tools.gyp:bitmap_region_decoder',
     'tools.gyp:resources',
     'tools.gyp:sk_tool_utils',
   ],
   'conditions': [
     ['skia_gpu == 1', {
       'include_dirs': [ '../src/gpu' ],
       'dependencies': [ 'gputest.gyp:skgputest' ],
     }],
     ['not skia_android_framework', {
         'sources!': [ '../bench/nanobenchAndroid.cpp' ],
     }],
   ],
 }