Add content_shell_test_apk and a several dependencies

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index ef7060c24d10b1872ee0cfd2e2c15dca523e21c7..b49109e64c57880b7dbeb4925877c6cfa747a172 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1231,6 +1231,7 @@
     ['OS == "android"', {
       'targets': [
         {
+          # GN: //base:base_jni_headers
           'target_name': 'base_jni_headers',
           'type': 'none',
           'sources': [
@@ -1260,6 +1261,7 @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'base_unittests_jni_headers',
           'type': 'none',
           'sources': [
@@ -1271,6 +1273,7 @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          # GN: //base:base_native_libraries_gen
           'target_name': 'base_native_libraries_gen',
           'type': 'none',
           'sources': [
@@ -1283,6 +1286,7 @@
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
+          # GN: //base:base_java
           'target_name': 'base_java',
           'type': 'none',
           'variables': {
@@ -1304,6 +1308,7 @@
           ],
         },
         {
+          # GN: //base:base_java_unittest_support
           'target_name': 'base_java_unittest_support',
           'type': 'none',
           'dependencies': [
@@ -1315,6 +1320,7 @@
           '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
@@ -1331,6 +1337,7 @@
           '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': [
@@ -1343,6 +1350,7 @@
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
+          # GN: //base:base_java_test_support
           'target_name': 'base_java_test_support',
           'type': 'none',
           'dependencies': [
@@ -1354,6 +1362,7 @@
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # GN: //base:base_javatests
           'target_name': 'base_javatests',
           'type': 'none',
           'dependencies': [
@@ -1366,6 +1375,7 @@
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'chromium_android_linker',
           'type': 'shared_library',
           'conditions': [
@@ -1389,12 +1399,8 @@
             }],
           ],
         },
-
-      ],
-    }],
-    ['OS == "android"', {
-      'targets': [
         {
+          # TODO(GN)
           'target_name': 'base_perftests_apk',
           'type': 'none',
           'dependencies': [
@@ -1405,6 +1411,19 @@
           },
           '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"', {
@@ -1423,22 +1442,6 @@
         },
       ],
     }],
-    ['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': [
         {