Add content_shell_test_apk and a several dependencies

base/base.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 1213 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
+          # GN: //base:base_jni_headers
           'target_name': 'base_jni_headers',
           'type': 'none',
           'sources': [
             'android/java/src/org/chromium/base/ApplicationStatus.java',
             'android/java/src/org/chromium/base/BuildInfo.java',
             'android/java/src/org/chromium/base/CommandLine.java',
             'android/java/src/org/chromium/base/ContentUriUtils.java',
             'android/java/src/org/chromium/base/CpuFeatures.java',
             'android/java/src/org/chromium/base/EventLog.java',
             'android/java/src/org/chromium/base/FieldTrialList.java',
             'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java',
             'android/java/src/org/chromium/base/JNIUtils.java',
             'android/java/src/org/chromium/base/library_loader/LibraryLoader.java',
             'android/java/src/org/chromium/base/MemoryPressureListener.java',
             'android/java/src/org/chromium/base/JavaHandlerThread.java',
             'android/java/src/org/chromium/base/PathService.java',
             'android/java/src/org/chromium/base/PathUtils.java',
             'android/java/src/org/chromium/base/PowerMonitor.java',
             'android/java/src/org/chromium/base/SystemMessageHandler.java',
             'android/java/src/org/chromium/base/SysUtils.java',
             'android/java/src/org/chromium/base/ThreadUtils.java',
             'android/java/src/org/chromium/base/TraceEvent.java',
           ],
           'variables': {
             'jni_gen_package': 'base',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'base_unittests_jni_headers',
           'type': 'none',
           'sources': [
             'test/android/java/src/org/chromium/base/ContentUriTestUtils.java',
           ],
           'variables': {
             'jni_gen_package': 'base',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          # GN: //base:base_native_libraries_gen
           'target_name': 'base_native_libraries_gen',
           'type': 'none',
           'sources': [
             'android/java/templates/NativeLibraries.template',
           ],
           'variables': {
             'package_name': 'org/chromium/base/library_loader',
             'template_deps': [],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
+          # GN: //base:base_java
           'target_name': 'base_java',
           'type': 'none',
           'variables': {
             'java_in_dir': '../base/android/java',
             'jar_excluded_classes': [ '*/NativeLibraries.class' ],
           },
           'dependencies': [
             'base_java_application_state',
             'base_java_memory_pressure_level_list',
             'base_native_libraries_gen',
           ],
           'includes': [ '../build/java.gypi' ],
           'conditions': [
             ['android_webview_build==0', {
               'dependencies': [
                 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
               ],
             }]
           ],
         },
         {
+          # GN: //base:base_java_unittest_support
           'target_name': 'base_java_unittest_support',
           'type': 'none',
           'dependencies': [
             'base_java',
           ],
           'variables': {
             'java_in_dir': '../base/test/android/java',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # GN: //base:base_java_application_state
           'target_name': 'base_java_application_state',
           'type': 'none',
           # This target is used to auto-generate ApplicationState.java
           # from a template file. The source file contains a list of
           # Java constant declarations matching the ones in
           # android/application_state_list.h.
           'sources': [
             'android/java/src/org/chromium/base/ApplicationState.template',
           ],
           'variables': {
             'package_name': 'org/chromium/base',
             'template_deps': ['android/application_state_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
+          # GN: //base:base_java_memory_pressure_level_list
           'target_name': 'base_java_memory_pressure_level_list',
           'type': 'none',
           'sources': [
             'android/java/src/org/chromium/base/MemoryPressureLevelList.template',
           ],
           'variables': {
             'package_name': 'org/chromium/base',
             'template_deps': ['memory/memory_pressure_level_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
+          # GN: //base:base_java_test_support
           'target_name': 'base_java_test_support',
           'type': 'none',
           'dependencies': [
             'base_java',
           ],
           'variables': {
             'java_in_dir': '../base/test/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # GN: //base:base_javatests
           'target_name': 'base_javatests',
           'type': 'none',
           'dependencies': [
             'base_java',
             'base_java_test_support',
           ],
           'variables': {
             'java_in_dir': '../base/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'chromium_android_linker',
           'type': 'shared_library',
           'conditions': [
             # Avoid breaking the webview build because it
             # does not have <(android_ndk_root)/crazy_linker.gyp.
             # Note that webview never uses the linker anyway.
             ['android_webview_build == 0', {
               'sources': [
                 'android/linker/linker_jni.cc',
               ],
               # The crazy linker is never instrumented.
               'cflags!': [
                 '-finstrument-functions',
               ],
               'dependencies': [
                 # The NDK contains the crazy_linker here:
                 #   '<(android_ndk_root)/crazy_linker.gyp:crazy_linker'
                 # However, we use our own fork.  See bug 384700.
                 '../third_party/android_crazy_linker/crazy_linker.gyp:crazy_linker',
               ],
             }],
           ],
         },
-
-      ],
-    }],
-    ['OS == "android"', {
-      'targets': [
         {
+          # TODO(GN)
           'target_name': 'base_perftests_apk',
           'type': 'none',
           'dependencies': [
             'base_perftests',
           ],
           'variables': {
             'test_suite_name': 'base_perftests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
+        {
+          # GN: //base:base_unittests_apk
+          'target_name': 'base_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'base_java',
+            'base_unittests',
+          ],
+          'variables': {
+            'test_suite_name': 'base_unittests',
+          },
+          'includes': [ '../build/apk_test.gypi' ],
+        },
       ],
     }],
     ['OS == "win"', {
       'targets': [
         {
           'target_name': 'debug_message',
           'type': 'executable',
           'sources': [
             'debug_message.cc',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
             },
           },
         },
       ],
     }],
-    ['OS == "android"', {
-      'targets': [
-        {
-          'target_name': 'base_unittests_apk',
-          'type': 'none',
-          'dependencies': [
-            'base_java',
-            'base_unittests',
-          ],
-          'variables': {
-            'test_suite_name': 'base_unittests',
-          },
-          'includes': [ '../build/apk_test.gypi' ],
-        },
-      ],
-    }],
     ['test_isolation_mode != "noop"', {
       'targets': [
         {
           'target_name': 'base_unittests_run',
           'type': 'none',
           'dependencies': [
             'base_unittests',
           ],
           'includes': [
             '../build/isolate.gypi',
             'base_unittests.isolate',
           ],
           'sources': [
             'base_unittests.isolate',
           ],
           'conditions': [
             ['use_x11 == 1', {
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }