Make write_library_dependencies.py find all transitive dependencies

build/android/setup.gyp

Index: build/android/setup.gyp
diff --git a/build/build_output_dirs_android.gyp b/build/android/setup.gyp
similarity index 62%
rename from build/build_output_dirs_android.gyp
rename to build/android/setup.gyp
index cc35e6d871c03af9743c7a8aea6e061712c80b5c..ba043b1c2207019247277debb129908de54f50e7 100644
--- a/build/build_output_dirs_android.gyp
+++ b/build/android/setup.gyp
@@ -2,6 +2,29 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
+  'conditions': [
+    ['component == "shared_library"', {
+      'targets': [
+        {
+          # These libraries from the Android ndk are required to be packaged with
+          # any APK that is built with them. build/java_apk.gypi expects any
+          # libraries that should be packaged with the apk to be in
+          # <(SHARED_LIB_DIR)
+          'target_name': 'copy_system_libraries',
+          'type': 'none',
+          'copies': [
+            {
+              'destination': '<(SHARED_LIB_DIR)/',
+              'files': [
+                '<(android_stlport_libs_dir)/libstlport_shared.so',
+                '<(android_libstdcpp_libs_dir)/libgnustl_shared.so',
+              ],
+            },
+          ],
+        },
+      ],
+    }],
+  ],
   'targets': [
     {
       # Target for creating common output build directories. Creating output
@@ -34,5 +57,6 @@
         },
       ],
     }, # build_output_dirs
-  ], # targets
+  ]
 }
+