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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/android/javatests/AndroidManifest.xml.jinja2 ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_android.gypi
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi
index 738e40ebfe3668a9bb4938e81d2b60c9e997fae6..eb0a13d9c8de2b681a7eb91fa5645ea5f1f79d21 100644
--- a/remoting/remoting_android.gypi
+++ b/remoting/remoting_android.gypi
@@ -188,14 +188,41 @@
],
}, # end of target 'remoting_apk'
{
+ 'target_name': 'remoting_test_apk_manifest',
+ 'type': 'none',
+ 'sources': [
+ 'android/javatests/AndroidManifest.xml.jinja2',
+ ],
+ 'rules': [{
+ 'rule_name': 'generate_manifest',
+ 'extension': 'jinja2',
+ 'inputs': [
+ '<(remoting_localize_path)',
+ '<(branding_path)',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/remoting/android_test/<(RULE_INPUT_ROOT)',
+ ],
+ 'action': [
+ 'python', '<(remoting_localize_path)',
+ '--variables', '<(branding_path)',
+ '--template', '<(RULE_INPUT_PATH)',
+ '--locale_output', '<@(_outputs)',
+ 'en',
+ ],
+ }],
+ }, # end of target 'remoting_test_apk_manifest'
+ {
'target_name': 'remoting_test_apk',
'type': 'none',
'dependencies': [
'../base/base.gyp:base_java_test_support',
'remoting_android_client_java',
+ 'remoting_test_apk_manifest',
],
'variables': {
'apk_name': 'ChromotingTest',
+ 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/remoting/android_test/AndroidManifest.xml',
'java_in_dir': 'android/javatests',
'is_test_apk': 1,
},
« 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