Skip to content

GitLab

T
tangled
Commit 1f51d659 authored by lambroslambrou@chromium.org's avatar lambroslambrou@chromium.org
Browse files
Options

Move remoting Android targets to separate gypi 

This pulls Android-specific targets out of remoting.gyp into a new
gypi file.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243868 0039d316-1c4b-4281-b951-d872f2087c98
parent bd209792
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 141 deletions
remoting/remoting.gyp
View file @ 1f51d659
...@@ -219,6 +219,7 @@ ...@@ -219,6 +219,7 @@
'includes': [ 'includes': [
'../chrome/js_unittest_vars.gypi', '../chrome/js_unittest_vars.gypi',
'remoting_android.gypi',
], ],
'target_defaults': { 'target_defaults': {
...@@ -1810,142 +1811,6 @@ ...@@ -1810,142 +1811,6 @@
], # end of 'targets' ], # end of 'targets'
}], # 'OS=="win"' }], # '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 # The host installation is generated only if WiX is available. If
# component build is used the produced installation will not work due to # 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 # missing DLLs. We build it anyway to make sure the GYP scripts are executed
...@@ -2160,11 +2025,6 @@ ...@@ -2160,11 +2025,6 @@
'client/plugin/normalizing_input_filter_cros.cc', 'client/plugin/normalizing_input_filter_cros.cc',
], ],
}], }],
[ 'OS=="android"', {
'sources/': [
['exclude', '^client/plugin/'],
],
}],
], ],
}, # end of target 'remoting_client_plugin' }, # end of target 'remoting_client_plugin'
{ {
...@@ -3002,6 +2862,11 @@ ...@@ -3002,6 +2862,11 @@
'<@(remoting_webapp_js_files)', '<@(remoting_webapp_js_files)',
], ],
}], }],
[ 'OS=="android"', {
'dependencies!': [
'remoting_client_plugin',
],
}],
['OS=="android" and gtest_target_type=="shared_library"', { ['OS=="android" and gtest_target_type=="shared_library"', {
'dependencies': [ 'dependencies': [
'../testing/android/native_test.gyp:native_test_native_code', '../testing/android/native_test.gyp:native_test_native_code',
......
remoting/remoting_android.gypi 0 → 100644
View file @ 1f51d659
# Copyright 2014 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.
{
'conditions': [
['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"'
], # end of 'conditions'
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment