Reapply "Changes according to review comments"

ui/ui_unittests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'ui_test_support',
       'dependencies': [
         '../base/base.gyp:base',
@@ skipping 11 matching lines @@
       'conditions': [
         ['OS=="mac"', {
           'type': 'static_library',
         }, { # OS != "mac"
           'type': 'none',
         }],
       ],
     },
     {
       'target_name': 'ui_unittests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'includes': [
         'base/ime/ime_unittests.gypi',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ skipping 104 matching lines @@
           'sources': [
             'base/x/events_x_unittest.cc',
           ],
         }],
         ['OS != "mac"', {
           'sources': [
             'gfx/transform_unittest.cc',
             'gfx/interpolated_transform_unittest.cc',
           ],
         }],
+        ['OS=="android" and "<(gtest_target_type)"=="shared_library"', {
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
+          ],
+        }],
         ['use_glib == 1', {
           'dependencies': [
             '../build/linux/system.gyp:pangocairo',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
             'base/strings/ui_strings.gyp:ui_unittest_strings',
           ],
           'conditions': [
             ['linux_use_tcmalloc==1', {
                'dependencies': [
                  '../base/allocator/allocator.gyp:allocator',
@@ skipping 32 matching lines @@
           ],
         }],
         ['use_aura==1 or toolkit_views==1', {
           'sources': [
             'base/gestures/velocity_calculator_unittest.cc',
           ],
         }],
       ],
     },
   ],
+  'conditions': [
+    # Special target to wrap a <(gtest_target_type)==shared_library
+    # ui_unittests into an android apk for execution.
+    # See base.gyp for TODO(jrg)s about this strategy.
+    ['OS=="android" and "<(gtest_target_type)"=="shared_library"', {
+      'targets': [
+        {
+          'target_name': 'ui_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'ui_unittests',
+          ],
+          'actions': [
+            {
+              # Generate apk files (including source and antfile) from
+              # a template, and builds them.
+              'action_name': 'generate_and_build',
+              'inputs': [
+                '../testing/android/generate_native_test.py',
+                '<(PRODUCT_DIR)/lib.target/libui_unittests.so',
+                '<(PRODUCT_DIR)/chromium_base.jar',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/ChromeNativeTests_ui_unittests-debug.apk',
+              ],
+              'action': [
+                '../testing/android/generate_native_test.py',
+                '--native_library',
+                '<(PRODUCT_DIR)/lib.target/libui_unittests.so',
+                # TODO(jrg): find a better way to specify jar
+                # dependencies.  Hard coding seems fragile.
+                '--jar',
+                '<(PRODUCT_DIR)/chromium_base.jar',
+                '--output',
+                '<(PRODUCT_DIR)/ui_unittests_apk',
+                '--ant-args',
+                '-DPRODUCT_DIR=<(PRODUCT_DIR)',
+                '--ant-compile'
+              ],
+            },
+          ]
+        },
+      ],
+    }],
+  ],
 }