A bit of misc cleanup.

gyp/common_conditions.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.
 
 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
@@ skipping 304 matching lines @@
       'cflags': [
         # Skia does not enforce this usage pattern so we disable it here to avoid
         # unecessary log spew when building
         '-Wno-unused-parameter',
 
         # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkString.
         # Revert to -D_FORTIFY_SOURCE=1
         '-U_FORTIFY_SOURCE',
         '-D_FORTIFY_SOURCE=1',
 
-        # We can't use the skia_shared_library gyp setting because we need to
+        # We can't use the skia_shared_lib gyp setting because we need to
         # isolate this define to Skia sources. CFLAGS are local to Android.mk
         # and ensures that this define is not exported to clients of the library
         '-DSKIA_IMPLEMENTATION=1',
       ],
       # Remove flags which are either unnecessary or problematic for the
       # Android framework build. Many of these flags are removed simply because
       # they were not previously in the Android framework makefile, and we did
       # did not intend to add them when generating the makefile.
       # TODO (scroggo): Investigate whether any of these flags are actually
       # needed/would be beneficial.
@@ skipping 26 matching lines @@
         'SK_USE_FREETYPE_EMBOLDEN',
         'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"',
         # When built as part of the system image we can enable certian non-NDK
         # compliant optimizations.
         'SK_BUILD_FOR_ANDROID_FRAMEWORK',
         # Optimizations for chromium (m30)
         'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
         'SK_DEFAULT_FONT_CACHE_LIMIT   (768 * 1024)',
         'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
         'SK_IGNORE_ETC1_SUPPORT',
-        # We can't use the skia_shared_library gyp setting because we need expose
+        # We can't use the skia_shared_lib gyp setting because we need expose
         # this define globally and the the implemention define as a cflag.
         'SKIA_DLL',
         'SK_PRINT_CODEC_MESSAGES',
       ],
     }],
 
     ['skia_use_android_framework_defines', {
       # Add these defines when building for the Android framework, or when
       # specifically requested. These should be temporary staging defines. Any
       # permanent defines should be moved into the skia_android_framework block
@@ skipping 237 matching lines @@
     [ 'sknx_no_simd', {
       'defines': [ 'SKNX_NO_SIMD' ],
     }],
 
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }