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

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

Issue 1851423003: Make Web Push use InstanceID tokens instead of GCM registrations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iid4default
Patch Set: Rebase (main conflics in browsertest and PMMF) Created 4 years, 7 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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 '../../base/base.gyp:base_java', 274 '../../base/base.gyp:base_java',
275 '../../base/base.gyp:base_java_test_support', 275 '../../base/base.gyp:base_java_test_support',
276 '../../chrome/chrome.gyp:chrome_java', 276 '../../chrome/chrome.gyp:chrome_java',
277 '../../chrome/chrome.gyp:chrome_java_test_support', 277 '../../chrome/chrome.gyp:chrome_java_test_support',
278 '../../components/components.gyp:invalidation_javatests', 278 '../../components/components.gyp:invalidation_javatests',
279 '../../components/components.gyp:gcm_driver_java', 279 '../../components/components.gyp:gcm_driver_java',
280 '../../components/components.gyp:offline_page_model_enums_java', 280 '../../components/components.gyp:offline_page_model_enums_java',
281 '../../components/components.gyp:precache_javatests', 281 '../../components/components.gyp:precache_javatests',
282 '../../components/components.gyp:security_state_enums_java', 282 '../../components/components.gyp:security_state_enums_java',
283 '../../components/components.gyp:web_contents_delegate_android_java', 283 '../../components/components.gyp:web_contents_delegate_android_java',
284 '../../components/components.gyp:instance_id_driver_test_support_java',
284 '../../content/content_shell_and_tests.gyp:content_java_test_support', 285 '../../content/content_shell_and_tests.gyp:content_java_test_support',
285 '../../net/net.gyp:net_java', 286 '../../net/net.gyp:net_java',
286 '../../net/net.gyp:net_java_test_support', 287 '../../net/net.gyp:net_java_test_support',
287 '../../sync/sync.gyp:sync_java_test_support', 288 '../../sync/sync.gyp:sync_java_test_support',
288 '../../third_party/android_tools/android_tools.gyp:android_support_v7_ap pcompat_javalib', 289 '../../third_party/android_tools/android_tools.gyp:android_support_v7_ap pcompat_javalib',
289 '../../third_party/android_tools/android_tools.gyp:google_play_services_ javalib', 290 '../../third_party/android_tools/android_tools.gyp:google_play_services_ javalib',
290 '../../ui/android/ui_android.gyp:ui_javatests', 291 '../../ui/android/ui_android.gyp:ui_javatests',
291 ], 292 ],
292 'includes': [ '../../build/java.gypi' ], 293 'includes': [ '../../build/java.gypi' ],
293 }, 294 },
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 } 415 }
415 ], 416 ],
416 ], 417 ],
417 } 418 }
418 419
419 # Local Variables: 420 # Local Variables:
420 # tab-width:2 421 # tab-width:2
421 # indent-tabs-mode:nil 422 # indent-tabs-mode:nil
422 # End: 423 # End:
423 # vim: set expandtab tabstop=2 shiftwidth=2: 424 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698