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

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

Issue 1229073003: Move Android version stamping from an exec_script -> build rule (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn14
Patch Set: fix default argument for native lib version Created 5 years, 5 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 | build/util/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("//third_party/android_platform/config.gni") 8 import("//third_party/android_platform/config.gni")
9 import("//tools/grit/grit_rule.gni") 9 import("//tools/grit/grit_rule.gni")
10 10
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 _native_libs += 1446 _native_libs +=
1447 [ "$root_build_dir/lib.stripped/libchromium_android_linker.so" ] 1447 [ "$root_build_dir/lib.stripped/libchromium_android_linker.so" ]
1448 } 1448 }
1449 1449
1450 _enable_relocation_packing = false 1450 _enable_relocation_packing = false
1451 if (_use_chromium_linker && defined(invoker.enable_relocation_packing) && 1451 if (_use_chromium_linker && defined(invoker.enable_relocation_packing) &&
1452 invoker.enable_relocation_packing) { 1452 invoker.enable_relocation_packing) {
1453 _enable_relocation_packing = true 1453 _enable_relocation_packing = true
1454 } 1454 }
1455 1455
1456 _native_lib_version_name = "" 1456 _native_lib_version_rule = ""
1457 if (defined(invoker.native_lib_version_name)) { 1457 if (defined(invoker.native_lib_version_rule)) {
1458 _native_lib_version_name = invoker.native_lib_version_name 1458 _native_lib_version_rule = invoker.native_lib_version_rule
1459 }
1460 _native_lib_version_arg = "\"\""
1461 if (defined(invoker.native_lib_version_arg)) {
1462 _native_lib_version_arg = invoker.native_lib_version_arg
1459 } 1463 }
1460 } 1464 }
1461 1465
1462 _android_manifest_deps = [] 1466 _android_manifest_deps = []
1463 if (defined(invoker.android_manifest_dep)) { 1467 if (defined(invoker.android_manifest_dep)) {
1464 _android_manifest_deps = [ invoker.android_manifest_dep ] 1468 _android_manifest_deps = [ invoker.android_manifest_dep ]
1465 } 1469 }
1466 _android_manifest = invoker.android_manifest 1470 _android_manifest = invoker.android_manifest
1467 1471
1468 _rebased_build_config = rebase_path(_build_config, root_build_dir) 1472 _rebased_build_config = rebase_path(_build_config, root_build_dir)
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
1529 package_name = "org/chromium/base/library_loader" 1533 package_name = "org/chromium/base/library_loader"
1530 sources = [ 1534 sources = [
1531 "//base/android/java/templates/NativeLibraries.template", 1535 "//base/android/java/templates/NativeLibraries.template",
1532 ] 1536 ]
1533 inputs = [ 1537 inputs = [
1534 _build_config, 1538 _build_config,
1535 ] 1539 ]
1536 deps = [ 1540 deps = [
1537 ":$build_config_target", 1541 ":$build_config_target",
1538 ] 1542 ]
1543 if (_native_lib_version_rule != "") {
1544 deps += [ _native_lib_version_rule ]
1545 }
1539 1546
1540 defines = [ 1547 defines = [
1541 "NATIVE_LIBRARIES_LIST=" + 1548 "NATIVE_LIBRARIES_LIST=" +
1542 "@FileArg($_rebased_build_config:native:java_libraries_list)", 1549 "@FileArg($_rebased_build_config:native:java_libraries_list)",
1543 "NATIVE_LIBRARIES_VERSION_NUMBER=\"$_native_lib_version_name\"", 1550 "NATIVE_LIBRARIES_VERSION_NUMBER=$_native_lib_version_arg",
1544 ] 1551 ]
1545 if (_use_chromium_linker) { 1552 if (_use_chromium_linker) {
1546 defines += [ "ENABLE_CHROMIUM_LINKER" ] 1553 defines += [ "ENABLE_CHROMIUM_LINKER" ]
1547 } 1554 }
1548 if (_load_library_from_apk) { 1555 if (_load_library_from_apk) {
1549 defines += [ "ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE" ] 1556 defines += [ "ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE" ]
1550 } 1557 }
1551 if (_enable_chromium_linker_tests) { 1558 if (_enable_chromium_linker_tests) {
1552 defines += [ "ENABLE_CHROMIUM_LINKER_TESTS" ] 1559 defines += [ "ENABLE_CHROMIUM_LINKER_TESTS" ]
1553 } 1560 }
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
2215 template("uiautomator_test") { 2222 template("uiautomator_test") {
2216 set_sources_assignment_filter([]) 2223 set_sources_assignment_filter([])
2217 if (defined(invoker.testonly)) { 2224 if (defined(invoker.testonly)) {
2218 testonly = invoker.testonly 2225 testonly = invoker.testonly
2219 } 2226 }
2220 assert(target_name != "") 2227 assert(target_name != "")
2221 assert(invoker.deps != [] || true) 2228 assert(invoker.deps != [] || true)
2222 group(target_name) { 2229 group(target_name) {
2223 } 2230 }
2224 } 2231 }
OLDNEW
« no previous file with comments | « no previous file | build/util/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698