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

Side by Side Diff: remoting/remoting_android.gypi

Issue 451973002: Capabilities + Extensions + Cast Host Extension Support for Android client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor Fix Created 6 years, 4 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/remoting.gyp ('k') | remoting/resources/remoting_strings.grd » ('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 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 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'remoting_jni_headers', 10 'target_name': 'remoting_jni_headers',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 'files': [ 49 'files': [
50 'resources/chromoting128.png', 50 'resources/chromoting128.png',
51 'resources/icon_host.png', 51 'resources/icon_host.png',
52 ], 52 ],
53 }, 53 },
54 ], 54 ],
55 }, # end of target 'remoting_android_resources' 55 }, # end of target 'remoting_android_resources'
56 { 56 {
57 'target_name': 'remoting_apk_manifest', 57 'target_name': 'remoting_apk_manifest',
58 'type': 'none', 58 'type': 'none',
59 'sources': [ 59 'conditions': [
60 'android/java/AndroidManifest.xml.jinja2', 60 ['enable_cast==1', {
61 'sources': [
62 'android/cast/AndroidManifest.xml.jinja2'
63 ],
64 }, { # 'enable_cast != 1'
65 'sources': [
66 'android/java/AndroidManifest.xml.jinja2',
67 ],
68 }],
61 ], 69 ],
62 'rules': [{ 70 'rules': [{
63 'rule_name': 'generate_manifest', 71 'rule_name': 'generate_manifest',
64 'extension': 'jinja2', 72 'extension': 'jinja2',
65 'inputs': [ 73 'inputs': [
66 '<(remoting_localize_path)', 74 '<(remoting_localize_path)',
67 '<(branding_path)', 75 '<(branding_path)',
68 ], 76 ],
69 'outputs': [ 77 'outputs': [
70 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/<(RULE_INPUT_ROOT)', 78 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/<(RULE_INPUT_ROOT)',
(...skipping 16 matching lines...) Expand all
87 'R_package': 'org.chromium.chromoting', 95 'R_package': 'org.chromium.chromoting',
88 'R_package_relpath': 'org/chromium/chromoting', 96 'R_package_relpath': 'org/chromium/chromoting',
89 'res_extra_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res ' ], 97 'res_extra_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res ' ],
90 'res_extra_files': [ 98 'res_extra_files': [
91 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I NTERMEDIATE_DIR)" resources/remoting_strings.grd)', 99 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I NTERMEDIATE_DIR)" resources/remoting_strings.grd)',
92 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable/chromoti ng128.png', 100 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable/chromoti ng128.png',
93 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable/icon_hos t.png', 101 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable/icon_hos t.png',
94 ], 102 ],
95 }, 103 },
96 'dependencies': [ 104 'dependencies': [
105 'android_support_v4_javalib_no_res',
97 '../base/base.gyp:base_java', 106 '../base/base.gyp:base_java',
98 '../ui/android/ui_android.gyp:ui_java', 107 '../ui/android/ui_android.gyp:ui_java',
99 'remoting_android_resources', 108 'remoting_android_resources',
109 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib',
110 '../third_party/android_tools/android_tools.gyp:android_support_v7_m ediarouter_javalib',
100 ], 111 ],
101 'includes': [ '../build/java.gypi' ], 112 'includes': [ '../build/java.gypi' ],
113 'conditions' : [
114 ['enable_cast==1', {
115 'variables': {
116 'additional_src_dirs': [
117 'android/cast',
118 ],
119 },
120 'dependencies': [
121 'google_play_services_javalib',
122 ],
123 }],
124 ],
102 }, 125 },
103 { 126 {
104 'target_name': 'remoting_apk', 127 'target_name': 'remoting_apk',
105 'type': 'none', 128 'type': 'none',
106 'dependencies': [ 129 'dependencies': [
107 'remoting_apk_manifest', 130 'remoting_apk_manifest',
108 'remoting_client_jni', 131 'remoting_client_jni',
109 'remoting_android_client_java', 132 'remoting_android_client_java',
110 ], 133 ],
111 'variables': { 134 'variables': {
(...skipping 13 matching lines...) Expand all
125 '../base/base.gyp:base_java_test_support', 148 '../base/base.gyp:base_java_test_support',
126 'remoting_android_client_java', 149 'remoting_android_client_java',
127 ], 150 ],
128 'variables': { 151 'variables': {
129 'apk_name': 'ChromotingTest', 152 'apk_name': 'ChromotingTest',
130 'java_in_dir': 'android/javatests', 153 'java_in_dir': 'android/javatests',
131 'is_test_apk': 1, 154 'is_test_apk': 1,
132 }, 155 },
133 'includes': [ '../build/java_apk.gypi' ], 156 'includes': [ '../build/java_apk.gypi' ],
134 }, # end of target 'remoting_test_apk' 157 }, # end of target 'remoting_test_apk'
135 ], # end of 'targets' 158 {
159 # This jar contains the Android support v4 libary. It does not have
160 # any associated resources.
161 'target_name': 'android_support_v4_javalib_no_res',
162 'type': 'none',
163 'variables': {
164 'jar_path': '../third_party/android_tools/sdk/extras/android/support /v4/android-support-v4.jar',
165 },
166 'includes': ['../build/java_prebuilt.gypi'],
167 }, # end of target 'android_support_v4_javalib_no_res'
168 ], # end of 'targets'
169 'conditions': [
170 ['enable_cast==1', {
171 'targets': [
172 {
173 # This jar contains the Google Play services library without the
174 # resources needed for the library to work. See crbug.com/274697 or
175 # ../third_party/android_tools/android_tools.gyp for more info.
176 # This target will fail to build unless you have a local version
177 # of the Google Play services jar.
178 'target_name': 'google_play_services_javalib_no_res',
179 'type': 'none',
180 'variables': {
181 'jar_path': 'android/google-play-services_lib/libs/google-play -services.jar',
182 },
183 'includes': ['../build/java_prebuilt.gypi'],
184
185 }, # end of target 'google_play_services_javalib_no_res'
186 {
187 # This target contains the Google Play services library with the
188 # resources needed. It will fail to build unless you have a loca l
189 # version of the Google Play services libary project.
190 # TODO(aiguha): Solve issue of needing to use local version. Als o,
191 # watch crbug.com/274697.
192 'target_name': 'google_play_services_javalib',
193 'type': 'none',
194 'variables': {
195 'java_in_dir': 'android/google-play-services_lib/',
196 'R_package': ['com.google.android.gms'],
197 'R_package_relpath': ['com/google/android/gms'],
198 'has_java_resources': 1,
199 'res_v14_verify_only': 1,
200 },
201 'dependencies': [
202 'google_play_services_javalib_no_res',
203 ],
204 'includes': ['../build/java.gypi'],
205 }, # end of target 'google_play_services_javalib'
206 ], # end of targets
207 }],
208 ],
136 }], # 'OS=="android"' 209 }], # 'OS=="android"'
137 210
138 ['OS=="android"', { 211 ['OS=="android"', {
139 'targets': [ 212 'targets': [
140 { 213 {
141 'target_name': 'remoting_unittests_apk', 214 'target_name': 'remoting_unittests_apk',
142 'type': 'none', 215 'type': 'none',
143 'dependencies': [ 216 'dependencies': [
144 'remoting_unittests', 217 'remoting_unittests',
145 ], 218 ],
146 'variables': { 219 'variables': {
147 'test_suite_name': 'remoting_unittests', 220 'test_suite_name': 'remoting_unittests',
148 }, 221 },
149 'includes': [ '../build/apk_test.gypi' ], 222 'includes': [ '../build/apk_test.gypi' ],
150 }, 223 },
151 ], 224 ],
152 }], # 'OS=="android" 225 }], # 'OS=="android"
153 ], # end of 'conditions' 226 ], # end of 'conditions'
154 } 227 }
OLDNEW
« no previous file with comments | « remoting/remoting.gyp ('k') | remoting/resources/remoting_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698