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

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

Issue 1597273005: Move ChromiumMultiDex to BuildConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 10 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 | « base/base.gyp ('k') | build/java_apk.gypi » ('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("//build/config/sanitizers/sanitizers.gni") 8 import("//build/config/sanitizers/sanitizers.gni")
9 import("//build/toolchain/toolchain.gni") 9 import("//build/toolchain/toolchain.gni")
10 import("//third_party/android_platform/config.gni") 10 import("//third_party/android_platform/config.gni")
(...skipping 1510 matching lines...) Expand 10 before | Expand all | Expand 10 after
1521 defines += [ "ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE" ] 1521 defines += [ "ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE" ]
1522 } 1522 }
1523 if (_enable_chromium_linker_tests) { 1523 if (_enable_chromium_linker_tests) {
1524 defines += [ "ENABLE_CHROMIUM_LINKER_TESTS" ] 1524 defines += [ "ENABLE_CHROMIUM_LINKER_TESTS" ]
1525 } 1525 }
1526 } 1526 }
1527 _srcjar_deps += [ ":${_template_name}__native_libraries_java" ] 1527 _srcjar_deps += [ ":${_template_name}__native_libraries_java" ]
1528 } 1528 }
1529 1529
1530 if (!defined(invoker.apk_under_test)) { 1530 if (!defined(invoker.apk_under_test)) {
1531 java_cpp_template("${_template_name}__multidex_config_java") { 1531 java_cpp_template("${_template_name}__build_config_java") {
1532 package_name = "org/chromium/base/multidex" 1532 package_name = "org/chromium/base"
1533 sources = [ 1533 sources = [
1534 "//base/android/java/templates/ChromiumMultiDex.template", 1534 "//base/android/java/templates/BuildConfig.template",
1535 ] 1535 ]
1536 1536
1537 defines = [] 1537 defines = []
1538 if (enable_multidex) { 1538 if (enable_multidex) {
1539 defines += [ "ENABLE_MULTIDEX" ] 1539 defines += [ "ENABLE_MULTIDEX" ]
1540 } 1540 }
1541 } 1541 }
1542 _srcjar_deps += [ ":${_template_name}__multidex_config_java" ] 1542 _srcjar_deps += [ ":${_template_name}__build_config_java" ]
1543 } 1543 }
1544 1544
1545 java_target = "${_template_name}__java" 1545 java_target = "${_template_name}__java"
1546 java_library_impl(java_target) { 1546 java_library_impl(java_target) {
1547 forward_variables_from(invoker, [ "run_findbugs" ]) 1547 forward_variables_from(invoker, [ "run_findbugs" ])
1548 supports_android = true 1548 supports_android = true
1549 requires_android = true 1549 requires_android = true
1550 override_build_config = _build_config 1550 override_build_config = _build_config
1551 deps = _android_manifest_deps + [ ":$build_config_target" ] 1551 deps = _android_manifest_deps + [ ":$build_config_target" ]
1552 1552
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
2399 "--target", 2399 "--target",
2400 rebase_path(invoker.target, root_build_dir), 2400 rebase_path(invoker.target, root_build_dir),
2401 "--output-directory", 2401 "--output-directory",
2402 rebase_path(root_out_dir, root_build_dir), 2402 rebase_path(root_out_dir, root_build_dir),
2403 ] 2403 ]
2404 if (defined(invoker.flag_name)) { 2404 if (defined(invoker.flag_name)) {
2405 args += [ "--flag-name=${invoker.flag_name}" ] 2405 args += [ "--flag-name=${invoker.flag_name}" ]
2406 } 2406 }
2407 } 2407 }
2408 } 2408 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698