Wrap remoting_unittests in an APK

This adds a remoting_unittests_apk target, and enables the tests to
build and run on an Android device.

Followup CLs will fix/disable the failing tests. Once the test-run is
clean, we can add this target to build/all_android.gyp.

BUG=326702

Review URL: https://codereview.chromium.org/111643004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240418 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 28 insertions, 2 deletions

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index a93a8d2..e2c49b1 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -1954,6 +1954,23 @@
       ],  # end of 'targets'
     }],  # 'OS=="android"'
 
+    ['OS=="android" and gtest_target_type=="shared_library"', {
+      'targets': [
+        {
+          'target_name': 'remoting_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'remoting_unittests',
+          ],
+          'variables': {
+            'test_suite_name': 'remoting_unittests',
+            'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)remoting_unittests<(SHARED_LIB_SUFFIX)',
+          },
+          'includes': [ '../build/apk_test.gypi' ],
+        },
+      ],
+    }],  # 'OS=="android" and gtest_target_type=="shared_library"'
+
     # The host installation is generated only if WiX is available. If
     # component build is used the produced installation will not work due to
     # missing DLLs. We build it anyway to make sure the GYP scripts are executed
@@ -2169,9 +2186,13 @@
             'client/plugin/normalizing_input_filter_cros.cc',
           ],
         }],
+        [ 'OS=="android"', {
+          'sources/': [
+            ['exclude', '^client/plugin/'],
+          ],
+        }],
       ],
     },  # end of target 'remoting_client_plugin'
-
     {
       'target_name': 'remoting_host_event_logger',
       'type': 'static_library',
@@ -2809,7 +2830,7 @@
     # Remoting unit tests
     {
       'target_name': 'remoting_unittests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
@@ -3008,6 +3029,11 @@
             '<@(remoting_webapp_js_files)',
           ],
         }],
+        ['OS=="android" and gtest_target_type=="shared_library"', {
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
+          ],
+        }],
         [ '(OS!="linux" or chromeos==0)', {
           'sources!': [
             'client/plugin/normalizing_input_filter_cros_unittest.cc',