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

Side by Side Diff: build/config/android/rules.gni

Issue 2629663003: Reland of Android: Delete rezip in favor of zipalign -p (Closed)
Patch Set: no gdbserver Created 3 years, 11 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # Do not add any imports to non-//build directories here. 5 # Do not add any imports to non-//build directories here.
6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. 6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
7 import("//build/config/android/config.gni") 7 import("//build/config/android/config.gni")
8 import("//build/config/android/internal_rules.gni") 8 import("//build/config/android/internal_rules.gni")
9 import("//build/config/compiler/compiler.gni") 9 import("//build/config/compiler/compiler.gni")
10 import("//build/config/dcheck_always_on.gni") 10 import("//build/config/dcheck_always_on.gni")
(...skipping 1989 matching lines...) Expand 10 before | Expand all | Expand 10 after
2000 deps += _secondary_abi_native_libs_deps 2000 deps += _secondary_abi_native_libs_deps
2001 deps += [ ":$build_config_target" ] 2001 deps += [ ":$build_config_target" ]
2002 } 2002 }
2003 } 2003 }
2004 } 2004 }
2005 2005
2006 _extra_native_libs = [] 2006 _extra_native_libs = []
2007 _extra_native_libs_deps = [] 2007 _extra_native_libs_deps = []
2008 assert(_extra_native_libs_deps == []) # Mark as used. 2008 assert(_extra_native_libs_deps == []) # Mark as used.
2009 _extra_native_libs_even_when_incremental = [] 2009 _extra_native_libs_even_when_incremental = []
2010 _extra_native_libs_even_when_incremental_deps = []
2011 assert(_extra_native_libs_even_when_incremental_deps == []) # Mark as used.
2012 if (_native_libs_deps != []) { 2010 if (_native_libs_deps != []) {
2013 # zipalign can't align gdb_server, don't pack gdbserver temporarily.
2014 if (is_debug && (!defined(invoker.page_align_shared_libraries) ||
2015 !invoker.page_align_shared_libraries)) {
2016 _extra_native_libs_even_when_incremental = [ android_gdbserver ]
2017 }
2018
2019 if (_use_chromium_linker) { 2011 if (_use_chromium_linker) {
2020 _extra_native_libs = 2012 _extra_native_libs =
2021 [ "$root_shlib_dir/libchromium_android_linker$shlib_extension" ] 2013 [ "$root_shlib_dir/libchromium_android_linker$shlib_extension" ]
2022 _extra_native_libs_deps += 2014 _extra_native_libs_deps +=
2023 [ "//base/android/linker:chromium_android_linker" ] 2015 [ "//base/android/linker:chromium_android_linker" ]
2024 } 2016 }
2025 } 2017 }
2026 if (defined(invoker.loadable_modules) && invoker.loadable_modules != []) { 2018 if (defined(invoker.loadable_modules) && invoker.loadable_modules != []) {
2027 _extra_native_libs_even_when_incremental += invoker.loadable_modules 2019 _extra_native_libs_even_when_incremental += invoker.loadable_modules
2028 } 2020 }
2029 2021
2030 _final_deps += [ ":${_template_name}__create" ] 2022 _final_deps += [ ":${_template_name}__create" ]
2031 create_apk("${_template_name}__create") { 2023 create_apk("${_template_name}__create") {
2032 forward_variables_from(invoker, 2024 forward_variables_from(invoker,
2033 [ 2025 [
2034 "alternative_android_sdk_jar", 2026 "alternative_android_sdk_jar",
2035 "android_aapt_path", 2027 "android_aapt_path",
2036 "app_as_shared_lib", 2028 "app_as_shared_lib",
2037 "deps", 2029 "deps",
2038 "extensions_to_not_compress", 2030 "extensions_to_not_compress",
2039 "language_splits", 2031 "language_splits",
2040 "page_align_shared_libraries",
2041 "public_deps", 2032 "public_deps",
2042 "secondary_native_libs", 2033 "secondary_native_libs",
2043 "shared_resources", 2034 "shared_resources",
2044 "uncompress_shared_libraries", 2035 "uncompress_shared_libraries",
2045 "write_asset_list", 2036 "write_asset_list",
2046 ]) 2037 ])
2047 if (!defined(deps)) { 2038 if (!defined(deps)) {
2048 deps = [] 2039 deps = []
2049 } 2040 }
2050 apk_path = _final_apk_path 2041 apk_path = _final_apk_path
(...skipping 29 matching lines...) Expand all
2080 deps += _android_manifest_deps + [ 2071 deps += _android_manifest_deps + [
2081 ":$build_config_target", 2072 ":$build_config_target",
2082 ":$process_resources_target", 2073 ":$process_resources_target",
2083 ":$final_dex_target_name", 2074 ":$final_dex_target_name",
2084 ] 2075 ]
2085 2076
2086 if ((_native_libs_deps != [] || 2077 if ((_native_libs_deps != [] ||
2087 _extra_native_libs_even_when_incremental != []) && 2078 _extra_native_libs_even_when_incremental != []) &&
2088 !_create_abi_split) { 2079 !_create_abi_split) {
2089 deps += _native_libs_deps + _extra_native_libs_deps + 2080 deps += _native_libs_deps + _extra_native_libs_deps +
2090 _extra_native_libs_even_when_incremental_deps +
2091 [ _native_libs_file_arg_dep ] 2081 [ _native_libs_file_arg_dep ]
2092 native_libs_filearg = _native_libs_file_arg 2082 native_libs_filearg = _native_libs_file_arg
2093 native_libs = _extra_native_libs 2083 native_libs = _extra_native_libs
2094 native_libs_even_when_incremental = 2084 native_libs_even_when_incremental =
2095 _extra_native_libs_even_when_incremental 2085 _extra_native_libs_even_when_incremental
2096 } 2086 }
2097 2087
2098 if (_secondary_abi_native_libs_deps != [] && !_create_abi_split) { 2088 if (_secondary_abi_native_libs_deps != [] && !_create_abi_split) {
2099 deps += _secondary_abi_native_libs_deps + 2089 deps += _secondary_abi_native_libs_deps +
2100 [ _secondary_abi_native_libs_file_arg_dep ] 2090 [ _secondary_abi_native_libs_file_arg_dep ]
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
2141 deps = [] 2131 deps = []
2142 forward_variables_from(invoker, 2132 forward_variables_from(invoker,
2143 [ 2133 [
2144 "alternative_android_sdk_jar", 2134 "alternative_android_sdk_jar",
2145 "android_aapt_path", 2135 "android_aapt_path",
2146 "deps", 2136 "deps",
2147 "native_lib_placeholders", 2137 "native_lib_placeholders",
2148 "public_deps", 2138 "public_deps",
2149 ]) 2139 ])
2150 2140
2151 incremental_deps = 2141 incremental_deps = deps + [ ":$_manifest_rule" ]
2152 deps + _extra_native_libs_even_when_incremental_deps +
2153 [ ":$_manifest_rule" ]
2154 deps = [] 2142 deps = []
2155 deps = incremental_deps + _native_libs_deps + _extra_native_libs_deps + 2143 deps = incremental_deps + _native_libs_deps + _extra_native_libs_deps +
2156 [ _native_libs_file_arg_dep ] 2144 [ _native_libs_file_arg_dep ]
2157 native_libs_filearg = _native_libs_file_arg 2145 native_libs_filearg = _native_libs_file_arg
2158 native_libs = _extra_native_libs 2146 native_libs = _extra_native_libs
2159 native_libs_even_when_incremental = 2147 native_libs_even_when_incremental =
2160 _extra_native_libs_even_when_incremental 2148 _extra_native_libs_even_when_incremental
2161 } 2149 }
2162 } 2150 }
2163 2151
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
2829 # because in practice they seem to contain classes required to be in the 2817 # because in practice they seem to contain classes required to be in the
2830 # classpath. 2818 # classpath.
2831 deps += _subjar_targets 2819 deps += _subjar_targets
2832 } 2820 }
2833 if (defined(_res_target_name)) { 2821 if (defined(_res_target_name)) {
2834 deps += [ ":$_res_target_name" ] 2822 deps += [ ":$_res_target_name" ]
2835 } 2823 }
2836 } 2824 }
2837 } 2825 }
2838 } 2826 }
OLDNEW
« 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