Bug 1280600: Use Gecko's 'libgabi++' on b2g, r=glandium

B2g came with its own version of 'libgabi++' in its toolchain. Gecko
on b2g isn't build any longer with this toolchain. With this patch
applied, Gecko's internal version of 'libgabi++' is used for building.

MozReview-Commit-ID: KU4OBYQ6cAW

build/moz.build

@@ -17,7 +17,7 @@ else:
 
 if CONFIG['OS_TARGET'] == 'Android' and CONFIG['MOZ_ANDROID_CXX_STL'] == 'mozstlport':
     DIRS += ['stlport']
-    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android' and CONFIG['ENABLE_INTL_API']:
+    if CONFIG['ENABLE_INTL_API']:
         DIRS += ['gabi++']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':

config/external/icu/common/moz.build

@@ -7,11 +7,7 @@
 Library('icuuc')
 FINAL_LIBRARY = 'icu'
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    OS_LIBS += [
-        'gabi++',
-    ]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android' and CONFIG['MOZ_ANDROID_CXX_STL'] == 'mozstlport':
+if CONFIG['OS_TARGET'] == 'Android' and CONFIG['MOZ_ANDROID_CXX_STL'] == 'mozstlport':
     USE_LIBS += [
         'gabi++'
     ]

config/external/icu/defs.mozbuild

@@ -33,7 +33,5 @@ elif CONFIG['OS_TARGET'] == 'WINNT':
 DISABLE_STL_WRAPPING = True
 ALLOW_COMPILER_WARNINGS = True
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android' and CONFIG['MOZ_ANDROID_CXX_STL'] == 'mozstlport':
+if CONFIG['OS_TARGET'] == 'Android' and CONFIG['MOZ_ANDROID_CXX_STL'] == 'mozstlport':
     LOCAL_INCLUDES += ['/build/gabi++/include']
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    LOCAL_INCLUDES += ['%' + CONFIG['ANDROID_SOURCE'] + '/abi/cpp/include']