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

Unified Diff: remoting/android/BUILD.gn

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 | « no previous file | remoting/android/javatests/AndroidManifest.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/android/BUILD.gn
diff --git a/remoting/android/BUILD.gn b/remoting/android/BUILD.gn
index b14baf873d8d54cec1001d2a552c086f566fc16b..e4542d1def4184aac87921e434a4108ff6e7f08c 100644
--- a/remoting/android/BUILD.gn
+++ b/remoting/android/BUILD.gn
@@ -121,13 +121,23 @@ remoting_apk_tmpl("remoting_apk") {
]
}
+remoting_localize("remoting_test_apk_manifest") {
+ sources = [
+ "javatests/AndroidManifest.xml.jinja2",
+ ]
+ locales = [ "en" ]
+ variables = [ branding_path ]
+ output = "$root_gen_dir/remoting/android_test/{{source_name_part}}"
+}
+
instrumentation_test_apk("remoting_test_apk") {
- android_manifest = "javatests/AndroidManifest.xml"
+ android_manifest = "$root_gen_dir/remoting/android_test/AndroidManifest.xml"
apk_name = "ChromotingTest"
apk_under_test = ":remoting_apk"
DEPRECATED_java_in_dir = "javatests/src"
deps = [
":remoting_android_client_java",
+ ":remoting_test_apk_manifest",
"//base:base_java",
"//base:base_java_test_support",
]
« no previous file with comments | « no previous file | remoting/android/javatests/AndroidManifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698