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

Unified Diff: android_webview/apk/system_webview_apk_common.gypi

Issue 1412633004: Generate license file separately (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/android_webview.gyp ('k') | android_webview/apk/system_webview_paks.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/apk/system_webview_apk_common.gypi
diff --git a/android_webview/apk/system_webview_apk_common.gypi b/android_webview/apk/system_webview_apk_common.gypi
index f18211f9e1ab61335ac3a5cde6275b9212625d61..b3966523b657b1f7d6ae591f45329d6e16f0ceaf 100644
--- a/android_webview/apk/system_webview_apk_common.gypi
+++ b/android_webview/apk/system_webview_apk_common.gypi
@@ -46,7 +46,8 @@
{
'destination': '<(asset_location)',
'files': [
- '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
+ '<(webview_licenses_path)',
+ '<(webview_chromium_pak_path)',
'<@(snapshot_copy_files)',
],
'conditions': [
@@ -58,27 +59,8 @@
],
},
],
- 'actions': [
- {
- 'action_name': 'generate_webview_license_notice',
- 'inputs': [
- '<!@(python <(DEPTH)/android_webview/tools/webview_licenses.py notice_deps)',
- '<(DEPTH)/android_webview/tools/licenses_notice.tmpl',
- '<(DEPTH)/android_webview/tools/webview_licenses.py',
- ],
- 'outputs': [
- '<(asset_location)/webview_licenses.notice',
- ],
- 'action': [
- 'python',
- '<(DEPTH)/android_webview/tools/webview_licenses.py',
- 'notice',
- '<(asset_location)/webview_licenses.notice',
- ],
- 'message': 'Generating WebView license notice',
- },
- ],
'includes': [
+ 'system_webview_paks.gypi',
'../../build/java_apk.gypi',
'../../build/android/jinja_template.gypi',
],
« no previous file with comments | « android_webview/android_webview.gyp ('k') | android_webview/apk/system_webview_paks.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698