Chromium Code Reviews| Index: build/config/android/rules.gni |
| diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni |
| index 2a45db4dd7f85c8eea14298019deec6366a073d2..6d286fef99bab7fea17fb702ea10f210c7a85a04 100644 |
| --- a/build/config/android/rules.gni |
| +++ b/build/config/android/rules.gni |
| @@ -2007,15 +2007,7 @@ if (enable_java_templates) { |
| _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. |
|
jbudorick
2016/12/20 21:29:51
I take it that it now can?
agrieve
2016/12/21 15:41:40
I didn't even try. afaik, there's no point in us e
|
| - 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" ] |
| @@ -2037,7 +2029,6 @@ if (enable_java_templates) { |
| "deps", |
| "extensions_to_not_compress", |
| "language_splits", |
| - "page_align_shared_libraries", |
| "public_deps", |
| "secondary_native_libs", |
| "shared_resources", |
| @@ -2087,7 +2078,6 @@ if (enable_java_templates) { |
| _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 |
| @@ -2148,9 +2138,7 @@ if (enable_java_templates) { |
| "public_deps", |
| ]) |
| - incremental_deps = |
| - deps + _extra_native_libs_even_when_incremental_deps + |
| - [ ":$_manifest_rule" ] |
| + incremental_deps = deps + [ ":$_manifest_rule" ] |
| deps = [] |
| deps = incremental_deps + _native_libs_deps + _extra_native_libs_deps + |
| [ _native_libs_file_arg_dep ] |