[Android] "Namespace" shared libraries for the component build

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 149b1b87e562a02ec576f355e367f9a9fcfe291f..665eae004bc9884d63cc39020a61cad5f0d750b8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -755,6 +755,7 @@
     'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
     'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
 
+
     # Use system ffmpeg instead of bundled one.
     'use_system_ffmpeg%': 0,
 
@@ -3141,9 +3142,23 @@
       'target_defaults': {
         'variables': {
           'release_extra_cflags%': '',
+          'conditions': [
+            # If we're using the components build, append "cr" to all shared
+            # libraries to avoid naming collisions with android system library
+            # versions with the same name (e.g. skia, icu).
+            # using
+            ['component=="shared_library"', {
+              'android_product_extension': 'cr.so',
+            }, {
+              'android_product_extension': 'so',
+            } ],
+          ],
         },
-
         'target_conditions': [
+          ['_type=="shared_library"', {
+           'product_extension': '<(android_product_extension)',
+          }],
+
           # Settings for building device targets using Android's toolchain.
           # These are based on the setup.mk file from the Android NDK.
           #