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

Unified Diff: build/android/gyp/apkbuilder.py

Issue 1493893007: GN: Fix placeholders having double .so extension and breaking rezip (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/apkbuilder.py
diff --git a/build/android/gyp/apkbuilder.py b/build/android/gyp/apkbuilder.py
index 9e6b934cac228163543f8b07d0cf1fa7fdb40c6d..8c7a449fbb20b767401e95c5fb69a754294f0df0 100755
--- a/build/android/gyp/apkbuilder.py
+++ b/build/android/gyp/apkbuilder.py
@@ -213,10 +213,10 @@ def main(args):
build_utils.AddToZipHermetic(out_apk, apk_path, src_path=path)
for name in sorted(options.native_lib_placeholders):
- # Make it non-empty so that its checksum is non-zero and is not
- # ignored by md5_check.
- apk_path = 'lib/%s/%s.so' % (options.android_abi, name)
- build_utils.AddToZipHermetic(out_apk, apk_path, data=':)')
+ # Empty libs files are ignored by md5check, but rezip requires them
+ # to be empty in order to identify them as placeholders.
+ apk_path = 'lib/%s/%s' % (options.android_abi, name)
+ build_utils.AddToZipHermetic(out_apk, apk_path, data='')
# 6. Java resources. Used only when coverage is enabled, so order
# doesn't matter).
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698