Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(443)

Side by Side Diff: remoting/remoting_android.gypi

Issue 1369903002: Android Chromoting: Add hooks for the official account-switcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add hooks for Google Play Services connection errors. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/android/java/src/org/chromium/chromoting/accountswitcher/AccountSwitcherFactory.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['OS=="android"', { 7 ['OS=="android"', {
8 'variables': {
9 # These hooks allow official builds to modify the remoting_apk target:
10 # Official build of remoting_apk pulls in extra code.
11 'remoting_apk_extra_dependencies%': [],
12 # A different ProGuard config for Google Play Services is needed since t he one used by
13 # Chromium and Google Chrome strips out code that we need.
14 'remoting_android_google_play_services_javalib%': '../third_party/androi d_tools/android_tools.gyp:google_play_services_javalib',
15 # Allows official builds to define the ApplicationContext class differen tly, and provide
16 # different implementations of parts of the product.
17 'remoting_apk_java_in_dir%': 'android/apk',
18 },
8 'targets': [ 19 'targets': [
9 { 20 {
10 'target_name': 'remoting_jni_headers', 21 'target_name': 'remoting_jni_headers',
11 'type': 'none', 22 'type': 'none',
12 'sources': [ 23 'sources': [
13 'android/java/src/org/chromium/chromoting/jni/Client.java', 24 'android/java/src/org/chromium/chromoting/jni/Client.java',
14 'android/java/src/org/chromium/chromoting/jni/JniInterface.java', 25 'android/java/src/org/chromium/chromoting/jni/JniInterface.java',
15 ], 26 ],
16 'variables': { 27 'variables': {
17 'jni_gen_package': 'remoting', 28 'jni_gen_package': 'remoting',
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I NTERMEDIATE_DIR)" resources/remoting_strings.grd)', 114 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I NTERMEDIATE_DIR)" resources/remoting_strings.grd)',
104 ], 115 ],
105 }, 116 },
106 'dependencies': [ 117 'dependencies': [
107 'remoting_android_resources', 118 'remoting_android_resources',
108 '../base/base.gyp:base_java', 119 '../base/base.gyp:base_java',
109 '../ui/android/ui_android.gyp:ui_java', 120 '../ui/android/ui_android.gyp:ui_java',
110 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib', 121 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib',
111 '../third_party/android_tools/android_tools.gyp:android_support_v7_m ediarouter_javalib', 122 '../third_party/android_tools/android_tools.gyp:android_support_v7_m ediarouter_javalib',
112 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib', 123 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib',
113 '../third_party/android_tools/android_tools.gyp:google_play_services _javalib',
114 '../third_party/cardboard-java/cardboard.gyp:cardboard_jar', 124 '../third_party/cardboard-java/cardboard.gyp:cardboard_jar',
125 '<(remoting_android_google_play_services_javalib)',
115 ], 126 ],
116 'includes': [ '../build/java.gypi' ], 127 'includes': [ '../build/java.gypi' ],
117 'conditions' : [ 128 'conditions' : [
118 ['enable_cast==1', { 129 ['enable_cast==1', {
119 'variables': { 130 'variables': {
120 'additional_src_dirs': [ 131 'additional_src_dirs': [
121 'android/cast', 132 'android/cast',
122 ], 133 ],
123 }, 134 },
124 }], 135 }],
125 ], 136 ],
126 }, 137 },
127 { 138 {
128 'target_name': 'remoting_apk', 139 'target_name': 'remoting_apk',
129 'type': 'none', 140 'type': 'none',
130 'dependencies': [ 141 'dependencies': [
131 'remoting_apk_manifest', 142 'remoting_apk_manifest',
132 'remoting_client_jni', 143 'remoting_client_jni',
133 'remoting_android_client_java', 144 'remoting_android_client_java',
145 '<@(remoting_apk_extra_dependencies)',
134 ], 146 ],
135 'variables': { 147 'variables': {
136 'apk_name': '<!(python <(version_py_path) -f <(branding_path) -t "@A PK_FILE_NAME@")', 148 'apk_name': '<!(python <(version_py_path) -f <(branding_path) -t "@A PK_FILE_NAME@")',
137 'android_app_version_name': '<(version_full)', 149 'android_app_version_name': '<(version_full)',
138 'android_app_version_code': '<!(python tools/android_version.py <(an droid_app_version_name))', 150 'android_app_version_code': '<!(python tools/android_version.py <(an droid_app_version_name))',
139 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/remoting/androi d/AndroidManifest.xml', 151 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/remoting/androi d/AndroidManifest.xml',
140 'java_in_dir': 'android/apk', 152 'java_in_dir': '<(remoting_apk_java_in_dir)',
141 'native_lib_target': 'libremoting_client_jni', 153 'native_lib_target': 'libremoting_client_jni',
142 }, 154 },
143 'includes': [ '../build/java_apk.gypi' ], 155 'includes': [ '../build/java_apk.gypi' ],
144 }, # end of target 'remoting_apk' 156 }, # end of target 'remoting_apk'
145 { 157 {
146 'target_name': 'remoting_test_apk', 158 'target_name': 'remoting_test_apk',
147 'type': 'none', 159 'type': 'none',
148 'dependencies': [ 160 'dependencies': [
149 '../base/base.gyp:base_java_test_support', 161 '../base/base.gyp:base_java_test_support',
150 'remoting_android_client_java', 162 'remoting_android_client_java',
(...skipping 18 matching lines...) Expand all
169 ], 181 ],
170 'variables': { 182 'variables': {
171 'test_suite_name': 'remoting_unittests', 183 'test_suite_name': 'remoting_unittests',
172 }, 184 },
173 'includes': [ '../build/apk_test.gypi' ], 185 'includes': [ '../build/apk_test.gypi' ],
174 }, 186 },
175 ], 187 ],
176 }], # 'OS=="android" 188 }], # 'OS=="android"
177 ], # end of 'conditions' 189 ], # end of 'conditions'
178 } 190 }
OLDNEW
« no previous file with comments | « remoting/android/java/src/org/chromium/chromoting/accountswitcher/AccountSwitcherFactory.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698