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

Side by Side Diff: chrome/android/chrome_apk.gyp

Issue 1258563005: Added Signin Utilities (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed John's Comments #2 Created 5 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
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 'includes': [ 5 'includes': [
6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces. 6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces.
7 '../../build/util/version.gypi' 7 '../../build/util/version.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'chromium_code': 1, 10 'chromium_code': 1,
11 'package_name': 'chrome_public_apk', 11 'package_name': 'chrome_public_apk',
12 'manifest_package': 'org.chromium.chrome', 12 'manifest_package': 'org.chromium.chrome',
13 'chrome_public_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public_apk_ manifest/AndroidManifest.xml', 13 'chrome_public_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public_apk_ manifest/AndroidManifest.xml',
14 'chrome_public_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public _test_apk_manifest/AndroidManifest.xml', 14 'chrome_public_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public _test_apk_manifest/AndroidManifest.xml',
15 # This list is shared with GN. 15 # This list is shared with GN.
16 # Defines a list of source files should be present in the open-source 16 # Defines a list of source files should be present in the open-source
17 # chrome-apk but not in the published static_library which is included in th e 17 # chrome-apk but not in the published static_library which is included in th e
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 'chrome_shared_test_java', 204 'chrome_shared_test_java',
205 'chrome_public_apk_java', 205 'chrome_public_apk_java',
206 '../../testing/android/on_device_instrumentation.gyp:broker_java', 206 '../../testing/android/on_device_instrumentation.gyp:broker_java',
207 '../../testing/android/on_device_instrumentation.gyp:require_driver_apk' , 207 '../../testing/android/on_device_instrumentation.gyp:require_driver_apk' ,
208 ], 208 ],
209 'variables': { 209 'variables': {
210 'android_manifest_path': '<(chrome_public_test_apk_manifest)', 210 'android_manifest_path': '<(chrome_public_test_apk_manifest)',
211 'package_name': 'chrome_public_test', 211 'package_name': 'chrome_public_test',
212 'java_in_dir': 'javatests', 212 'java_in_dir': 'javatests',
213 'java_in_dir_suffix': '/src_dummy', 213 'java_in_dir_suffix': '/src_dummy',
214 'resource_dir': '<(java_in_dir)/res',
214 'apk_name': 'ChromePublicTest', 215 'apk_name': 'ChromePublicTest',
215 'is_test_apk': 1, 216 'is_test_apk': 1,
216 'test_type': 'instrumentation', 217 'test_type': 'instrumentation',
217 'isolate_file': '../chrome_public_test_apk.isolate', 218 'isolate_file': '../chrome_public_test_apk.isolate',
218 }, 219 },
219 'includes': [ 220 'includes': [
220 '../../build/java_apk.gypi', 221 '../../build/java_apk.gypi',
221 '../../build/android/test_runner.gypi', 222 '../../build/android/test_runner.gypi',
222 ], 223 ],
223 }, 224 },
224 ], 225 ],
225 } 226 }
226 227
227 # Local Variables: 228 # Local Variables:
228 # tab-width:2 229 # tab-width:2
229 # indent-tabs-mode:nil 230 # indent-tabs-mode:nil
230 # End: 231 # End:
231 # vim: set expandtab tabstop=2 shiftwidth=2: 232 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/AndroidManifest.xml » ('j') | chrome/android/java/AndroidManifest.xml » ('J')

Powered by Google App Engine
This is Rietveld 408576698