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

For normal APKs, the build generates a list of libraries to load at
build time and this is used at runtime to load libraries. Update our
gtest APKs to use this.

This makes gtest APKs work in the component build.

BUG=158821


Review URL: https://chromiumcodereview.appspot.com/13962003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193536 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 44 deletions

diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index bbed98a..4a3cc4d 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',