refactor android defines to implicitly assume NDK compliance unless it is explicitly marked as bein…

gyp/common_conditions.gypi

 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
 #    'SK_SUPPORT_HINTING_SCALE_FACTOR',
   ],
   'conditions' : [
     ['skia_gpu == 1',
       {
@@ skipping 282 matching lines @@
           'OTHER_CPLUSPLUSFLAGS': '-fvisibility=hidden -fvisibility-inlines-hidden',
           'GCC_THUMB_SUPPORT': 'NO',
         },
       },
     ],
 
     ['skia_os == "android"',
       {
         'defines': [
           'SK_BUILD_FOR_ANDROID',
-          'SK_BUILD_FOR_ANDROID_NDK',
         ],
         'configurations': {
           'Debug': {
             'cflags': ['-g']
           },
           'Release': {
             'cflags': ['-O2'],
             'defines': [ 'NDEBUG' ],
           },
         },
@@ skipping 70 matching lines @@
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: