Android: Address old TODO about removing a data_dep

Also renames the nested targets to follow current conventions and to
ensure that any bot that does still depend on the _apk target will fail
because of this.

TBR=agrieve  # trivial test update

Change-Id: Ic958e1e74dd2f9628512369bd5a7ce01dd9c19cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857571
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707850}

base/android/path_utils_unittest.cc

@@ -57,8 +57,8 @@ TEST_F(PathUtilsTest, TestGetNativeLibraryDirectory) {
   EXPECT_TRUE(
       base::PathExists(path.Append("libbase_unittests.so")) ||
       base::PathExists(path.Append("libbase_unittests.cr.so")) ||
-      base::PathExists(path.Append("lib_base_unittests__library.so")) ||
-      base::PathExists(path.Append("lib_base_unittests__library.cr.so")));
+      base::PathExists(path.Append("libbase_unittests__library.so")) ||
+      base::PathExists(path.Append("libbase_unittests__library.cr.so")));
 }
 
 }  // namespace android

base/debug/elf_reader_unittest.cc

@@ -59,7 +59,7 @@ TEST(ElfReaderTest, ReadElfBuildIdLowercase) {
 TEST(ElfReaderTest, ReadElfLibraryName) {
 #if defined(OS_ANDROID)
   // On Android the library loader memory maps the full so file.
-  const char kLibraryName[] = "lib_base_unittests__library";
+  const char kLibraryName[] = "libbase_unittests__library";
   const void* addr = &__executable_start;
 #else
   const char kLibraryName[] = MALLOC_WRAPPER_LIB;

testing/test.gni

@@ -90,8 +90,8 @@ template("test") {
         }
       }
     } else {
-      _library_target = "_${target_name}__library"
-      _apk_target = "${target_name}_apk"
+      _library_target = "${target_name}__library"
+      _apk_target = "${target_name}__apk"
       _apk_specific_vars = [
         "android_manifest",
         "android_manifest_dep",
@@ -160,16 +160,6 @@ template("test") {
         if (defined(_unwind_table_asset_name)) {
           deps += [ ":${_unwind_table_asset_name}" ]
         }
-
-        # TODO(agrieve): Remove this data_dep once bots don't build the _apk
-        #     target (post-GYP).
-        # It's a bit backwards for the apk to depend on the runner script, since
-        # the apk is conceptually a runtime_dep of the script. However, it is
-        # currently necessary because the bots build this _apk target directly
-        # rather than the group() below.
-        data_deps = [
-          ":$_test_runner_target",
-        ]
       }
 
       _test_runner_target = "${_output_name}__test_runner_script"