Move remoting Android targets to separate gypi

remoting/remoting.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,
 
     'variables': {
       'conditions': [
@@ skipping 201 matching lines @@
       'host/installer/win/',
     ],
     'remoting_host_installer_win_files': [
       'host/installer/win/chromoting.wxs',
       'host/installer/win/parameters.json',
     ],
   },
 
   'includes': [
     '../chrome/js_unittest_vars.gypi',
+    'remoting_android.gypi',
   ],
 
   'target_defaults': {
     'defines': [
       'BINARY_CORE=1',
       'BINARY_DESKTOP=2',
       'BINARY_HOST_ME2ME=3',
       'BINARY_HOST_PLUGIN=4',
     ],
     'include_dirs': [
@@ skipping 1571 matching lines @@
                 '--output', '<@(_outputs)',
                 '<@(remoting_locales)',
               ],
               'message': 'Localizing the version information'
             },
           ],
         },  # end of target 'remoting_version_resources'
       ],  # end of 'targets'
     }],  # 'OS=="win"'
 
-    ['OS=="android"', {
-      'targets': [
-        {
-          'target_name': 'remoting_jni_headers',
-          'type': 'none',
-          'sources': [
-            'android/java/src/org/chromium/chromoting/jni/JniInterface.java',
-          ],
-          'variables': {
-            'jni_gen_package': 'remoting',
-          },
-          'includes': [ '../build/jni_generator.gypi' ],
-        },  # end of target 'remoting_jni_headers'
-        {
-          'target_name': 'remoting_client_jni',
-          'type': 'shared_library',
-          'dependencies': [
-            'remoting_base',
-            'remoting_client',
-            'remoting_jingle_glue',
-            'remoting_jni_headers',
-            'remoting_protocol',
-            '../google_apis/google_apis.gyp:google_apis',
-          ],
-          'sources': [
-            'client/jni/android_keymap.cc',
-            'client/jni/android_keymap.h',
-            'client/jni/chromoting_jni_instance.cc',
-            'client/jni/chromoting_jni_instance.h',
-            'client/jni/chromoting_jni_onload.cc',
-            'client/jni/chromoting_jni_runtime.cc',
-            'client/jni/chromoting_jni_runtime.h',
-            'client/jni/jni_frame_consumer.cc',
-            'client/jni/jni_frame_consumer.h',
-          ],
-        },  # end of target 'remoting_client_jni'
-        {
-          'target_name': 'remoting_android_resources',
-          'type': 'none',
-          'copies': [
-            {
-              'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable',
-              'files': [
-                'resources/chromoting128.png',
-                'resources/icon_host.png',
-              ],
-            },
-            {
-              'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/layout',
-              'files': [
-                'resources/layout/main.xml',
-                'resources/layout/host.xml',
-                'resources/layout/pin_dialog.xml',
-              ],
-            },
-            {
-              'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/menu',
-              'files': [
-                'resources/menu/chromoting_actionbar.xml',
-                'resources/menu/desktop_actionbar.xml',
-              ],
-            },
-            {
-              'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/values',
-              'files': [
-                'resources/strings.xml',
-                'resources/styles.xml',
-              ],
-            },
-          ],
-        },  # end of target 'remoting_android_resources'
-        {
-          'target_name': 'remoting_apk',
-          'type': 'none',
-          'dependencies': [
-            'remoting_client_jni',
-            'remoting_android_resources',
-          ],
-          'variables': {
-            'apk_name': 'Chromoting',
-            'android_app_version_name': '<(version_full)',
-            'android_app_version_code': '<!(python ../build/util/lastchange.py --revision-only)',
-            'manifest_package_name': 'org.chromium.chromoting',
-            'native_lib_target': 'libremoting_client_jni',
-            'java_in_dir': 'android/java',
-            'additional_res_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res' ],
-            'additional_input_paths': [
-              '<(PRODUCT_DIR)/obj/remoting/remoting_android_resources.actions_rules_copies.stamp',
-            ],
-          },
-          'includes': [ '../build/java_apk.gypi' ],
-        },  # end of target 'remoting_apk'
-        {
-          # remoting_apk creates a .jar file as a side effect. Any Java targets
-          # that need that .jar in their classpath should depend on this target.
-          'target_name': 'remoting_apk_java',
-          'type': 'none',
-          'dependencies': [
-            'remoting_apk',
-          ],
-          'includes': [ '../build/apk_fake_jar.gypi' ],
-        },  # end of target 'remoting_apk_java'
-        {
-          'target_name': 'remoting_test_apk',
-          'type': 'none',
-          'dependencies': [
-            '../base/base.gyp:base_java_test_support',
-            'remoting_apk_java',
-          ],
-          'variables': {
-            'apk_name': 'ChromotingTest',
-            'java_in_dir': 'android/javatests',
-            'is_test_apk': 1,
-          },
-          'includes': [ '../build/java_apk.gypi' ],
-        },  # end of target 'remoting_test_apk'
-      ],  # 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
     # by the bots.
     ['OS == "win" and wix_exists == "True" and sas_dll_exists == "True"', {
       'targets': [
         {
           'target_name': 'remoting_host_installation',
           'type': 'none',
           'dependencies': [
@@ skipping 194 matching lines @@
         'client/plugin/pepper_util.h',
         'client/plugin/pepper_view.cc',
         'client/plugin/pepper_view.h',
       ],
       'conditions' : [
         [ '(OS!="linux" or chromeos==0)', {
           'sources!': [
             'client/plugin/normalizing_input_filter_cros.cc',
           ],
         }],
-        [ 'OS=="android"', {
-          'sources/': [
-            ['exclude', '^client/plugin/'],

[Lambros, 2014/01/09 00:28:29]

This was excluding every source file from remoting_client_plugin target, which
is a bit silly! Instead, I'm removing the target as a dependency from
remoting_unittests.

-          ],
-        }],
       ],
     },  # end of target 'remoting_client_plugin'
     {
       'target_name': 'remoting_host_event_logger',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         'remoting_base',
       ],
       'sources': [
@@ skipping 817 matching lines @@
           ],
           'sources': [
             '../chrome/test/base/v8_unit_test.cc',
             '../chrome/test/base/v8_unit_test.h',
             'webapp/browser_globals.gtestjs',
             'webapp/all_js_load.gtestjs',
             'webapp/format_iq.gtestjs',
             '<@(remoting_webapp_js_files)',
           ],
         }],
+        [ 'OS=="android"', {
+          'dependencies!': [
+            'remoting_client_plugin',
+          ],
+        }],
         ['OS=="android" and gtest_target_type=="shared_library"', {

[Lambros, 2014/01/09 00:28:29]

I wanted to pull this out as well, but I don't think it's possible, as it would
mean defining the 'remoting_unittest' target again in the gypi, and that isn't
allowed.

           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         [ '(OS!="linux" or chromeos==0)', {
           'sources!': [
             'client/plugin/normalizing_input_filter_cros_unittest.cc',
           ],
         }],
         ['enable_remoting_host == 0', {
@@ skipping 24 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }