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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | remoting/android/javatests/AndroidManifest.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//remoting/android/client_java_tmpl.gni") 7 import("//remoting/android/client_java_tmpl.gni")
8 import("//remoting/android/remoting_apk_tmpl.gni") 8 import("//remoting/android/remoting_apk_tmpl.gni")
9 import("//remoting/remoting_options.gni") 9 import("//remoting/remoting_options.gni")
10 import("//remoting/tools/build/remoting_localize.gni") 10 import("//remoting/tools/build/remoting_localize.gni")
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 DEPRECATED_java_in_dir = "//remoting/android/apk/src" 114 DEPRECATED_java_in_dir = "//remoting/android/apk/src"
115 115
116 deps = [ 116 deps = [
117 ":remoting_android_client_java", 117 ":remoting_android_client_java",
118 "//base:base_java", 118 "//base:base_java",
119 "//net/android:net_java", 119 "//net/android:net_java",
120 google_play_services_resources, 120 google_play_services_resources,
121 ] 121 ]
122 } 122 }
123 123
124 remoting_localize("remoting_test_apk_manifest") {
125 sources = [
126 "javatests/AndroidManifest.xml.jinja2",
127 ]
128 locales = [ "en" ]
129 variables = [ branding_path ]
130 output = "$root_gen_dir/remoting/android_test/{{source_name_part}}"
131 }
132
124 instrumentation_test_apk("remoting_test_apk") { 133 instrumentation_test_apk("remoting_test_apk") {
125 android_manifest = "javatests/AndroidManifest.xml" 134 android_manifest = "$root_gen_dir/remoting/android_test/AndroidManifest.xml"
126 apk_name = "ChromotingTest" 135 apk_name = "ChromotingTest"
127 apk_under_test = ":remoting_apk" 136 apk_under_test = ":remoting_apk"
128 DEPRECATED_java_in_dir = "javatests/src" 137 DEPRECATED_java_in_dir = "javatests/src"
129 deps = [ 138 deps = [
130 ":remoting_android_client_java", 139 ":remoting_android_client_java",
140 ":remoting_test_apk_manifest",
131 "//base:base_java", 141 "//base:base_java",
132 "//base:base_java_test_support", 142 "//base:base_java_test_support",
133 ] 143 ]
134 } 144 }
OLDNEW
« 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