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

Side by Side Diff: remoting/remoting_android.gypi

Issue 1573913010: GN: Fix remoting_test_apk compile when is_chrome_branded=true (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/javatests/AndroidManifest.xml.jinja2 ('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': { 8 'variables': {
9 # These hooks allow official builds to modify the remoting_apk target: 9 # These hooks allow official builds to modify the remoting_apk target:
10 # Official build of remoting_apk pulls in extra code. 10 # Official build of remoting_apk pulls in extra code.
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 'conditions': [ 181 'conditions': [
182 ['target_arch == "arm"', { 182 ['target_arch == "arm"', {
183 'dependencies': [ 'remoting_cardboard_extract_native_lib' ], 183 'dependencies': [ 'remoting_cardboard_extract_native_lib' ],
184 'variables': { 184 'variables': {
185 'extra_native_libs': [ '<(SHARED_LIB_DIR)/libvrtoolkit.so' ], 185 'extra_native_libs': [ '<(SHARED_LIB_DIR)/libvrtoolkit.so' ],
186 }, 186 },
187 }], 187 }],
188 ], 188 ],
189 }, # end of target 'remoting_apk' 189 }, # end of target 'remoting_apk'
190 { 190 {
191 'target_name': 'remoting_test_apk_manifest',
192 'type': 'none',
193 'sources': [
194 'android/javatests/AndroidManifest.xml.jinja2',
195 ],
196 'rules': [{
197 'rule_name': 'generate_manifest',
198 'extension': 'jinja2',
199 'inputs': [
200 '<(remoting_localize_path)',
201 '<(branding_path)',
202 ],
203 'outputs': [
204 '<(SHARED_INTERMEDIATE_DIR)/remoting/android_test/<(RULE_INPUT_ROO T)',
205 ],
206 'action': [
207 'python', '<(remoting_localize_path)',
208 '--variables', '<(branding_path)',
209 '--template', '<(RULE_INPUT_PATH)',
210 '--locale_output', '<@(_outputs)',
211 'en',
212 ],
213 }],
214 }, # end of target 'remoting_test_apk_manifest'
215 {
191 'target_name': 'remoting_test_apk', 216 'target_name': 'remoting_test_apk',
192 'type': 'none', 217 'type': 'none',
193 'dependencies': [ 218 'dependencies': [
194 '../base/base.gyp:base_java_test_support', 219 '../base/base.gyp:base_java_test_support',
195 'remoting_android_client_java', 220 'remoting_android_client_java',
221 'remoting_test_apk_manifest',
196 ], 222 ],
197 'variables': { 223 'variables': {
198 'apk_name': 'ChromotingTest', 224 'apk_name': 'ChromotingTest',
225 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/remoting/androi d_test/AndroidManifest.xml',
199 'java_in_dir': 'android/javatests', 226 'java_in_dir': 'android/javatests',
200 'is_test_apk': 1, 227 'is_test_apk': 1,
201 }, 228 },
202 'includes': [ '../build/java_apk.gypi' ], 229 'includes': [ '../build/java_apk.gypi' ],
203 }, # end of target 'remoting_test_apk' 230 }, # end of target 'remoting_test_apk'
204 { 231 {
205 'target_name': 'remoting_unittests_apk', 232 'target_name': 'remoting_unittests_apk',
206 'type': 'none', 233 'type': 'none',
207 'dependencies': [ 234 'dependencies': [
208 'remoting_unittests', 235 'remoting_unittests',
209 ], 236 ],
210 'variables': { 237 'variables': {
211 'test_suite_name': 'remoting_unittests', 238 'test_suite_name': 'remoting_unittests',
212 }, 239 },
213 'includes': [ '../build/apk_test.gypi' ], 240 'includes': [ '../build/apk_test.gypi' ],
214 }, # end of target 'remoting_unittests_apk' 241 }, # end of target 'remoting_unittests_apk'
215 ], # end of 'targets' 242 ], # end of 'targets'
216 }], # 'OS=="android" 243 }], # 'OS=="android"
217 ], # end of 'conditions' 244 ], # end of 'conditions'
218 } 245 }
OLDNEW
« no previous file with comments | « remoting/android/javatests/AndroidManifest.xml.jinja2 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698