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

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

Issue 2048823004: PaymentRequest.abort() should return a promise. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove DummyPageHolder and TrackExceptionState for haraken@ comment. Created 4 years, 6 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,
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 '../../base/base.gyp:base_java_test_support', 272 '../../base/base.gyp:base_java_test_support',
273 '../../chrome/chrome.gyp:chrome_java', 273 '../../chrome/chrome.gyp:chrome_java',
274 '../../chrome/chrome.gyp:chrome_java_test_support', 274 '../../chrome/chrome.gyp:chrome_java_test_support',
275 '../../components/components.gyp:invalidation_javatests', 275 '../../components/components.gyp:invalidation_javatests',
276 '../../components/components.gyp:gcm_driver_java', 276 '../../components/components.gyp:gcm_driver_java',
277 '../../components/components.gyp:offline_page_model_enums_java', 277 '../../components/components.gyp:offline_page_model_enums_java',
278 '../../components/components.gyp:precache_javatests', 278 '../../components/components.gyp:precache_javatests',
279 '../../components/components.gyp:security_state_enums_java', 279 '../../components/components.gyp:security_state_enums_java',
280 '../../components/components.gyp:web_contents_delegate_android_java', 280 '../../components/components.gyp:web_contents_delegate_android_java',
281 '../../content/content_shell_and_tests.gyp:content_java_test_support', 281 '../../content/content_shell_and_tests.gyp:content_java_test_support',
282 '../../mojo/mojo_public.gyp:mojo_bindings_java',
283 '../../mojo/mojo_public.gyp:mojo_public_java',
282 '../../net/net.gyp:net_java', 284 '../../net/net.gyp:net_java',
283 '../../net/net.gyp:net_java_test_support', 285 '../../net/net.gyp:net_java_test_support',
284 '../../sync/sync.gyp:sync_java_test_support', 286 '../../sync/sync.gyp:sync_java_test_support',
285 '../../third_party/android_tools/android_tools.gyp:android_support_v7_ap pcompat_javalib', 287 '../../third_party/android_tools/android_tools.gyp:android_support_v7_ap pcompat_javalib',
286 '../../third_party/android_tools/android_tools.gyp:google_play_services_ javalib', 288 '../../third_party/android_tools/android_tools.gyp:google_play_services_ javalib',
289 '../../third_party/WebKit/public/blink.gyp:android_mojo_bindings_java',
287 '../../ui/android/ui_android.gyp:ui_javatests', 290 '../../ui/android/ui_android.gyp:ui_javatests',
288 ], 291 ],
289 'includes': [ '../../build/java.gypi' ], 292 'includes': [ '../../build/java.gypi' ],
290 }, 293 },
291 { 294 {
292 # GN: //chrome/android:chrome_public_test_apk_manifest 295 # GN: //chrome/android:chrome_public_test_apk_manifest
293 'target_name': 'chrome_public_test_apk_manifest', 296 'target_name': 'chrome_public_test_apk_manifest',
294 'type': 'none', 297 'type': 'none',
295 'variables': { 298 'variables': {
296 'jinja_inputs': ['javatests/AndroidManifest.xml'], 299 'jinja_inputs': ['javatests/AndroidManifest.xml'],
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 } 414 }
412 ], 415 ],
413 ], 416 ],
414 } 417 }
415 418
416 # Local Variables: 419 # Local Variables:
417 # tab-width:2 420 # tab-width:2
418 # indent-tabs-mode:nil 421 # indent-tabs-mode:nil
419 # End: 422 # End:
420 # vim: set expandtab tabstop=2 shiftwidth=2: 423 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698