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

Side by Side Diff: remoting/remoting_android.gypi

Issue 489053003: Use content URI to upload photos taken by camera (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add thread check Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome.gyp ('k') | ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java » ('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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 'R_package': 'org.chromium.chromoting', 95 'R_package': 'org.chromium.chromoting',
96 'R_package_relpath': 'org/chromium/chromoting', 96 'R_package_relpath': 'org/chromium/chromoting',
97 'res_extra_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res ' ], 97 'res_extra_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res ' ],
98 'res_extra_files': [ 98 'res_extra_files': [
99 '<!@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)',
100 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable/chromoti ng128.png', 100 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable/chromoti ng128.png',
101 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable/icon_hos t.png', 101 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable/icon_hos t.png',
102 ], 102 ],
103 }, 103 },
104 'dependencies': [ 104 'dependencies': [
105 'android_support_v4_javalib_no_res',
106 '../base/base.gyp:base_java', 105 '../base/base.gyp:base_java',
107 '../ui/android/ui_android.gyp:ui_java', 106 '../ui/android/ui_android.gyp:ui_java',
108 'remoting_android_resources', 107 'remoting_android_resources',
109 '../third_party/android_tools/android_tools.gyp:android_support_v7_a ppcompat_javalib', 108 '../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', 109 '../third_party/android_tools/android_tools.gyp:android_support_v7_m ediarouter_javalib',
110 '../third_party/android_tools/android_tools.gyp:android_support_v13_ javalib',
111 ], 111 ],
112 'includes': [ '../build/java.gypi' ], 112 'includes': [ '../build/java.gypi' ],
113 'conditions' : [ 113 'conditions' : [
114 ['enable_cast==1', { 114 ['enable_cast==1', {
115 'variables': { 115 'variables': {
116 'additional_src_dirs': [ 116 'additional_src_dirs': [
117 'android/cast', 117 'android/cast',
118 ], 118 ],
119 }, 119 },
120 'dependencies': [ 120 'dependencies': [
(...skipping 27 matching lines...) Expand all
148 '../base/base.gyp:base_java_test_support', 148 '../base/base.gyp:base_java_test_support',
149 'remoting_android_client_java', 149 'remoting_android_client_java',
150 ], 150 ],
151 'variables': { 151 'variables': {
152 'apk_name': 'ChromotingTest', 152 'apk_name': 'ChromotingTest',
153 'java_in_dir': 'android/javatests', 153 'java_in_dir': 'android/javatests',
154 'is_test_apk': 1, 154 'is_test_apk': 1,
155 }, 155 },
156 'includes': [ '../build/java_apk.gypi' ], 156 'includes': [ '../build/java_apk.gypi' ],
157 }, # end of target 'remoting_test_apk' 157 }, # end of target 'remoting_test_apk'
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' 158 ], # end of 'targets'
169 'conditions': [ 159 'conditions': [
170 ['enable_cast==1', { 160 ['enable_cast==1', {
171 'targets': [ 161 'targets': [
172 { 162 {
173 # This jar contains the Google Play services library without the 163 # This jar contains the Google Play services library without the
174 # resources needed for the library to work. See crbug.com/274697 or 164 # resources needed for the library to work. See crbug.com/274697 or
175 # ../third_party/android_tools/android_tools.gyp for more info. 165 # ../third_party/android_tools/android_tools.gyp for more info.
176 # This target will fail to build unless you have a local version 166 # This target will fail to build unless you have a local version
177 # of the Google Play services jar. 167 # of the Google Play services jar.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 ], 208 ],
219 'variables': { 209 'variables': {
220 'test_suite_name': 'remoting_unittests', 210 'test_suite_name': 'remoting_unittests',
221 }, 211 },
222 'includes': [ '../build/apk_test.gypi' ], 212 'includes': [ '../build/apk_test.gypi' ],
223 }, 213 },
224 ], 214 ],
225 }], # 'OS=="android" 215 }], # 'OS=="android"
226 ], # end of 'conditions' 216 ], # end of 'conditions'
227 } 217 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698