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

Unified Diff: build/config/android/rules.gni

Issue 2595233003: Revert of Android: Delete rezip in favor of zipalign -p (Closed)
Patch Set: Created 4 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 | « build/config/android/internal_rules.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 6d286fef99bab7fea17fb702ea10f210c7a85a04..2a45db4dd7f85c8eea14298019deec6366a073d2 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -2007,7 +2007,15 @@
_extra_native_libs_deps = []
assert(_extra_native_libs_deps == []) # Mark as used.
_extra_native_libs_even_when_incremental = []
+ _extra_native_libs_even_when_incremental_deps = []
+ assert(_extra_native_libs_even_when_incremental_deps == []) # Mark as used.
if (_native_libs_deps != []) {
+ # zipalign can't align gdb_server, don't pack gdbserver temporarily.
+ if (is_debug && (!defined(invoker.page_align_shared_libraries) ||
+ !invoker.page_align_shared_libraries)) {
+ _extra_native_libs_even_when_incremental = [ android_gdbserver ]
+ }
+
if (_use_chromium_linker) {
_extra_native_libs =
[ "$root_shlib_dir/libchromium_android_linker$shlib_extension" ]
@@ -2029,6 +2037,7 @@
"deps",
"extensions_to_not_compress",
"language_splits",
+ "page_align_shared_libraries",
"public_deps",
"secondary_native_libs",
"shared_resources",
@@ -2078,6 +2087,7 @@
_extra_native_libs_even_when_incremental != []) &&
!_create_abi_split) {
deps += _native_libs_deps + _extra_native_libs_deps +
+ _extra_native_libs_even_when_incremental_deps +
[ _native_libs_file_arg_dep ]
native_libs_filearg = _native_libs_file_arg
native_libs = _extra_native_libs
@@ -2138,7 +2148,9 @@
"public_deps",
])
- incremental_deps = deps + [ ":$_manifest_rule" ]
+ incremental_deps =
+ deps + _extra_native_libs_even_when_incremental_deps +
+ [ ":$_manifest_rule" ]
deps = []
deps = incremental_deps + _native_libs_deps + _extra_native_libs_deps +
[ _native_libs_file_arg_dep ]
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698