Issue 1906 - Fix broken Android build

libadblockplus.gyp

 {
   'conditions': [[
     # We don't want to use curl on Windows and Android, skip the check there
     'OS=="win" or OS=="android"',
     {
       'variables': {
         'have_curl': 0
       }
     },
     {
@@ skipping 31 matching lines @@
       'src/WebRequestJsObject.cpp',
       '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
     ],
     'direct_dependent_settings': {
       'include_dirs': ['include']
     },
     'conditions': [
       ['OS=="android"', {
         'link_settings': {
           'libraries': [
-            'android_arm.release/obj.target/tools/gyp/libv8_base.a',
+            'android_arm.release/obj.target/tools/gyp/libv8_base.arm.a',

[René Jeschke, 2015/01/29 14:22:22]

We are currently hardcoding 'arm' builds anyway, so I just changed the library
reference here. The new v8 seems to have changed the name.

             'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a',
           ],
         },
         'standalone_static_library': 1, # disable thin archives
       }, {
         'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'],
         'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
       }],
       ['have_curl==1',
         {
@@ skipping 106 matching lines @@
       'VCLinkerTool': {
         'SubSystem': '1',   # Console
         'EntryPointSymbol': 'mainCRTStartup',
       },
     },
     'xcode_settings': {
       'OTHER_LDFLAGS': ['-stdlib=libstdc++'],
     },
   }]
 }