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

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

Issue 1007053002: Add native lib version name to chrome_shell_apk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-fix-resources
Patch Set: Created 5 years, 9 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 | « no previous file | chrome/android/BUILD.gn » ('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 import("//base/android/linker/config.gni") 5 import("//base/android/linker/config.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/internal_rules.gni") 7 import("//build/config/android/internal_rules.gni")
8 import("//tools/grit/grit_rule.gni") 8 import("//tools/grit/grit_rule.gni")
9 import("//tools/relocation_packer/config.gni") 9 import("//tools/relocation_packer/config.gni")
10 10
(...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 if (_use_chromium_linker) { 1209 if (_use_chromium_linker) {
1210 _native_libs += 1210 _native_libs +=
1211 [ "$root_build_dir/lib.stripped/libchromium_android_linker.so" ] 1211 [ "$root_build_dir/lib.stripped/libchromium_android_linker.so" ]
1212 } 1212 }
1213 1213
1214 _enable_relocation_packing = false 1214 _enable_relocation_packing = false
1215 if (_use_chromium_linker && defined(invoker.enable_relocation_packing) && 1215 if (_use_chromium_linker && defined(invoker.enable_relocation_packing) &&
1216 invoker.enable_relocation_packing) { 1216 invoker.enable_relocation_packing) {
1217 _enable_relocation_packing = true 1217 _enable_relocation_packing = true
1218 } 1218 }
1219
1220 _native_lib_version_name = ""
1221 if (defined(invoker.native_lib_version_name)) {
1222 _native_lib_version_name = invoker.native_lib_version_name
1223 }
1219 } 1224 }
1220 1225
1221 _rebased_build_config = rebase_path(_build_config, root_build_dir) 1226 _rebased_build_config = rebase_path(_build_config, root_build_dir)
1222 1227
1223 write_build_config("${_template_name}__build_config") { 1228 write_build_config("${_template_name}__build_config") {
1224 type = "android_apk" 1229 type = "android_apk"
1225 dex_path = final_dex_path 1230 dex_path = final_dex_path
1226 resources_zip = resources_zip_path 1231 resources_zip = resources_zip_path
1227 build_config = _build_config 1232 build_config = _build_config
1228 1233
(...skipping 16 matching lines...) Expand all
1245 build_config = _build_config 1250 build_config = _build_config
1246 } 1251 }
1247 _srcjar_deps += [ ":${_template_name}__process_resources" ] 1252 _srcjar_deps += [ ":${_template_name}__process_resources" ]
1248 1253
1249 if (_native_libs != []) { 1254 if (_native_libs != []) {
1250 _enable_chromium_linker_tests = false 1255 _enable_chromium_linker_tests = false
1251 if (defined(invoker.enable_chromium_linker_tests)) { 1256 if (defined(invoker.enable_chromium_linker_tests)) {
1252 _enable_chromium_linker_tests = invoker.enable_chromium_linker_tests 1257 _enable_chromium_linker_tests = invoker.enable_chromium_linker_tests
1253 } 1258 }
1254 1259
1255 _native_lib_version_name = ""
1256
1257 java_cpp_template("${_template_name}__native_libraries_java") { 1260 java_cpp_template("${_template_name}__native_libraries_java") {
1258 package_name = "org/chromium/base/library_loader" 1261 package_name = "org/chromium/base/library_loader"
1259 sources = [ 1262 sources = [
1260 "//base/android/java/templates/NativeLibraries.template", 1263 "//base/android/java/templates/NativeLibraries.template",
1261 ] 1264 ]
1262 inputs = [ 1265 inputs = [
1263 _build_config, 1266 _build_config,
1264 ] 1267 ]
1265 1268
1266 defines = [ 1269 defines = [
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1737 template("uiautomator_test") { 1740 template("uiautomator_test") {
1738 set_sources_assignment_filter([]) 1741 set_sources_assignment_filter([])
1739 if (defined(invoker.testonly)) { 1742 if (defined(invoker.testonly)) {
1740 testonly = invoker.testonly 1743 testonly = invoker.testonly
1741 } 1744 }
1742 assert(target_name != "") 1745 assert(target_name != "")
1743 assert(invoker.deps != [] || true) 1746 assert(invoker.deps != [] || true)
1744 group(target_name) { 1747 group(target_name) {
1745 } 1748 }
1746 } 1749 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698