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

Side by Side Diff: android_webview/android_webview.gyp

Issue 1007443002: Update WebView's android framework jar to 5.1.0_r1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add minor gyp tidyup Created 5 years, 9 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 | « no previous file | android_webview/apk/system_webview_apk_common.gypi » ('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 2009 The Chromium Authors. All rights reserved. 1 # Copyright 2009 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'android_webview_pak', 10 'target_name': 'android_webview_pak',
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 'java_in_dir': '../android_webview/java', 375 'java_in_dir': '../android_webview/java',
376 'has_java_resources': 1, 376 'has_java_resources': 1,
377 'R_package': 'org.chromium.android_webview', 377 'R_package': 'org.chromium.android_webview',
378 'R_package_relpath': 'org/chromium/android_webview', 378 'R_package_relpath': 'org/chromium/android_webview',
379 }, 379 },
380 'includes': [ '../build/java.gypi' ], 380 'includes': [ '../build/java.gypi' ],
381 }, 381 },
382 { 382 {
383 'target_name': 'system_webview_apk', 383 'target_name': 'system_webview_apk',
384 'variables': { 384 'variables': {
385 'android_sdk_jar': '<(DEPTH)/third_party/android_platform/webview/fr ameworks_1622219.jar',
386 'apk_name': 'SystemWebView', 385 'apk_name': 'SystemWebView',
386 'android_sdk_jar': '../third_party/android_platform/webview/framewor ks_5.1.0_r1.jar',
387 'android_manifest_path': 'apk/java/AndroidManifest.xml', 387 'android_manifest_path': 'apk/java/AndroidManifest.xml',
388 'java_in_dir': '../android_webview/glue/java', 388 'java_in_dir': 'glue/java',
389 'resource_dir': 'apk/java/res', 389 'resource_dir': 'apk/java/res',
390 'shared_resources': 1,
391 }, 390 },
392 'includes': [ 'apk/system_webview_apk_common.gypi' ], 391 'includes': [ 'apk/system_webview_apk_common.gypi' ],
393 }, 392 },
394 ], 393 ],
395 }, { # android_webview_build==1 394 }, { # android_webview_build==1
396 'targets': [ 395 'targets': [
397 { 396 {
398 'target_name': 'android_webview_jarjar_ui_resources', 397 'target_name': 'android_webview_jarjar_ui_resources',
399 'android_unmangled_name': 1, 398 'android_unmangled_name': 1,
400 'type': 'none', 399 'type': 'none',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 'android_webview_jarjar_content_resources', 433 'android_webview_jarjar_content_resources',
435 'android_webview_jarjar_ui_resources', 434 'android_webview_jarjar_ui_resources',
436 'android_webview_jarjar_web_contents_delegate_android_resources', 435 'android_webview_jarjar_web_contents_delegate_android_resources',
437 'android_webview_strings_grd', 436 'android_webview_strings_grd',
438 ], 437 ],
439 }, 438 },
440 ], 439 ],
441 }], 440 }],
442 ], 441 ],
443 } 442 }
OLDNEW
« no previous file with comments | « no previous file | android_webview/apk/system_webview_apk_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698