Various OpenGLUI changes:

runtime/embedders/openglui/openglui_embedder.gypi

 # Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 {
+  # TODO(gram) : figure out how to make this be autoconfigured. 
+  # I've tried a bunch of things with no success yet.
+  'variables': {
+    'skia_build_flag' : '--release',
+    'skia_libs_location_android': '-Lthird_party/skia/trunk/out/config/android-x86/Release/obj.target/gyp', 
+    'skia_libs_location_desktop': '-Lthird_party/skia/trunk/out/Debug', 
+  },
   'conditions': [
     ['OS=="android"',
       {
         'targets': [
           {
             # Dart shared library for Android.
             'target_name': 'android_embedder',
             'type': 'shared_library',
             'dependencies': [
               'skia-android',
@@ skipping 43 matching lines @@
               'common/canvas_state.cc',
               'common/canvas_state.h',
               'common/context.h',
               'common/dart_host.cc',
               'common/dart_host.h',
               'common/events.h',
               'common/extension.cc',
               'common/extension.h',
               'common/graphics_handler.cc',
               'common/graphics_handler.h',
+              'common/image_cache.cc',
+              'common/image_cache.h',
               'common/input_handler.cc',
               'common/input_handler.h',
               'common/isized.h',
               'common/life_cycle_handler.h',
               'common/log.h',
               'common/opengl.h',
               'common/resource.h',
               'common/sample.h',
               'common/sound_handler.cc',
               'common/sound_handler.h',
               'common/support.h',
               'common/timer.cc',
               'common/timer.h',
               'common/types.h',
               'common/vm_glue.cc',
               'common/vm_glue.h',
               '<(version_cc_file)',
             ],
             'link_settings': {
               'ldflags': [
                 # The libraries we need should all be in
                 # Lthird_party/skia/trunk/out/config/android-x86/Debug but
                 # As I (gram) want to avoid patching the Skia gyp files to build
                 # real libraries we'll just point to the location of the 'thin'
                 # libraries used by the Skia build for now.
                 # TODO(gram): We need to support debug vs release modes.
-                '-Lthird_party/skia/trunk/out/config/android-x86/Debug/obj.target/gyp', 
+                '<(skia_libs_location_android)',
                 '-z',
                 'muldefs',
-                '-g'
               ],
               'ldflags!': [
                 '-Wl,--exclude-libs=ALL,-shared',
               ],
               'libraries': [
                 '-Wl,--start-group',
                 '-lexpat',
                 '-lfreetype',
                 '-lgif',
                 '-ljpeg',
@@ skipping 37 matching lines @@
                 ],
                 # For now we drive the build from a shell
                 # script, to get us going. Eventually we will
                 # want to either fork Skia or incorporate its 
                 # gclient settings into ours, and include its 
                 # gyp files within ours, so that it gets built
                 # as part of our tree.
                 'action': [
                   'embedders/openglui/build_skia.sh',
                   '--android',
+                  '<(skia_build_flag)',
                   '..'
                 ],
                 'message': 'Building Skia.'
               }
             ]
           }
         ],
       },
     ],
     ['OS=="mac" or OS=="linux"',
@@ skipping 34 matching lines @@
               'common/canvas_state.cc',
               'common/canvas_state.h',
               'common/context.h',
               'common/dart_host.cc',
               'common/dart_host.h',
               'common/events.h',
               'common/extension.cc',
               'common/extension.h',
               'common/graphics_handler.cc',
               'common/graphics_handler.h',
+              'common/image_cache.cc',
+              'common/image_cache.h',
               'common/input_handler.cc',
               'common/input_handler.h',
               'common/isized.h',
               'common/life_cycle_handler.h',
               'common/log.h',
               'common/opengl.h',
               'common/resource.h',
               'common/sample.h',
               'common/sound_handler.cc',
               'common/sound_handler.h',
               'common/support.h',
               'common/support.h',
               'common/timer.cc',
               'common/timer.h',
               'common/types.h',
               'common/vm_glue.cc',
               'common/vm_glue.h',
               'emulator/emulator_embedder.cc',
               'emulator/emulator_embedder.h',
               'emulator/emulator_graphics_handler.cc',
               'emulator/emulator_graphics_handler.h',
               'emulator/emulator_resource.h',
               '<(version_cc_file)',
             ],
             'link_settings': {
               'ldflags': [
                 '-Wall',
-                '-g',
-                '-Lthird_party/skia/trunk/out/Debug', 
+                '<(skia_libs_location_desktop)',
                 '-Wl,--start-group',
                 '-lskia_effects',
                 '-lskia_images',
                 '-lskia_core',
                 '-lskia_opts',
                 '-lskia_opts_ssse3',
                 '-lskia_ports',
                 '-lskia_sfnt',
                 '-lskia_utils',
                 '-lskia_gr',
@@ skipping 23 matching lines @@
               {
                 'action_name': 'build_skia',
                 'inputs': [
                   'build_skia.sh'
                 ],
                 'outputs': [
                   'dummy' # To force re-execution every time.
                 ],
                 'action': [
                   'embedders/openglui/build_skia.sh',
+                  '<(skia_build_flag)',
                   '..'
                 ],
                 'message': 'Building Skia.'
               }
             ]
           }
         ],
       },
     ],
   ],
 }