[Android] Use the build-generated list of libraries for gtest APKs

testing/android/native_test.gyp

Index: testing/android/native_test.gyp
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index bbed98a7dccc717167aa73cf62e1cc44a8f60d14..4a3cc4d8fab0bc0f482b8ed47a89dbe36be6597e 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -7,50 +7,6 @@
     ['OS=="android"', {
       'targets': [
         {
-          'target_name': 'native_test_apk',
-          'message': 'building native test apk',
-          'type': 'none',
-          'dependencies': [
-            'native_test_native_code',
-            '<(DEPTH)/base/base.gyp:base_java',
-          ],
-          'actions': [
-            {
-              'action_name': 'native_test_apk',
-              'inputs': [
-                '<(DEPTH)/testing/android/native_test_apk.xml',
-                '<!@(find <(DEPTH)/testing/android -name "*.java")',
-                '>@(input_jars_paths)',
-                'native_test_launcher.cc'
-              ],
-              'outputs': [
-                # Awkwardly, we build a Debug APK even when gyp is in
-                # Release mode.  I don't think it matters (e.g. we're
-                # probably happy to not codesign) but naming should be
-                # fixed.  The -debug name is an aspect of the android
-                # SDK antfiles (e.g. ${sdk.dir}/tools/ant/build.xml)
-                '<(PRODUCT_DIR)/replaceme_apk/replaceme-debug.apk',
-              ],
-              'action': [
-                'ant', '-q',
-                # TODO: All of these paths are absolute paths right now, while
-                # we really should be using relative paths for anything that is
-                # checked in to the Chromium tree (among which the SDK).
-                '-DPRODUCT_DIR=<(ant_build_out)',
-                '-DANDROID_SDK=<(android_sdk)',
-                '-DANDROID_SDK_ROOT=<(android_sdk_root)',
-                '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
-                '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-                '-DANDROID_GDBSERVER=<(android_gdbserver)',
-                '-DCHROMIUM_SRC=<(ant_build_out)/../..',
-                '-DINPUT_JARS_PATHS=>(input_jars_paths)',
-                '-buildfile',
-                '<(DEPTH)/testing/android/native_test_apk.xml',
-              ]
-            }
-          ],
-        },
-        {
           'target_name': 'native_test_native_code',
           'message': 'building native pieces of native test package',
           'type': 'static_library',