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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/android/finalize_apk_action.gypi

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/enable_asserts.py ('k') | build/android/findbugs_action.gypi » ('j') | mojo/public/tools/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/finalize_apk_action.gypi
diff --git a/build/android/finalize_apk_action.gypi b/build/android/finalize_apk_action.gypi
index 9934c1a78f1823610e4ef12b8ff66101f33d919d..bdf996604bdb07f21d9a8a4de2016c5156459479 100644
--- a/build/android/finalize_apk_action.gypi
+++ b/build/android/finalize_apk_action.gypi
@@ -22,16 +22,8 @@
'keystore_path%': '<(DEPTH)/build/android/ant/chromium-debug.keystore',
'keystore_name%': 'chromiumdebugkey',
'keystore_password%': 'chromium',
- 'conditions': [
- # Webview doesn't use zipalign or rezip_apk_jar.
- ['android_webview_build==0', {
- 'zipalign_path%': '<(android_sdk_tools)/zipalign',
- 'rezip_apk_jar_path%': '<(PRODUCT_DIR)/lib.java/rezip_apk.jar'
- }, {
- 'zipalign_path%': "",
- 'rezip_apk_jar_path%': "",
- }],
- ],
+ 'zipalign_path%': '<(android_sdk_tools)/zipalign',
+ 'rezip_apk_jar_path%': '<(PRODUCT_DIR)/lib.java/rezip_apk.jar',
},
'inputs': [
'<(DEPTH)/build/android/gyp/finalize_apk.py',
« no previous file with comments | « build/android/enable_asserts.py ('k') | build/android/findbugs_action.gypi » ('j') | mojo/public/tools/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698