[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: http://src.chromium.org/svn/trunk/src/build@193536 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

all_android.gyp

@@ -84,11 +84,6 @@
         }],
         ['"<(gtest_target_type)"=="shared_library"', {
           'dependencies': [
-            # The first item is simply the template.  We add as a dep
-            # to make sure it builds in ungenerated form.  TODO(jrg):
-            # once stable, transition to a test-only (optional)
-            # target.
-            '../testing/android/native_test.gyp:native_test_apk',
             # Unit test bundles packaged as an apk.
             '../android_webview/android_webview.gyp:android_webview_unittests_apk',
             '../base/base.gyp:base_unittests_apk',

apk_test.gypi

@@ -56,6 +56,7 @@
              '<(DEPTH)/testing/android/generate_native_test.py',
              '<(input_shlib_path)',
              '>@(input_jars_paths)',
+             '<!@(find <(DEPTH)/testing/android/java)',
            ],
            'outputs': [
              '<(generate_native_test_stamp)',

common.gypi

@@ -1254,9 +1254,6 @@
 
         'p2p_apis%' : 0,
 
-        # TODO(jrg): when 'gtest_target_type'=='shared_library' and
-        # OS==android, make all gtest_targets depend on
-        # testing/android/native_test.gyp:native_test_apk.
         'gtest_target_type%': 'shared_library',
 
         # Uses system APIs for decoding audio and video.