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

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

Issue 1581563003: [Android] Rework multidex and enable multidex for unit_tests_apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix junit tests Created 4 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/android/java_cpp_template.gypi ('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 1466 matching lines...) Expand 10 before | Expand all | Expand 10 after
1477 if (_load_library_from_apk) { 1477 if (_load_library_from_apk) {
1478 defines += [ "ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE" ] 1478 defines += [ "ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE" ]
1479 } 1479 }
1480 if (_enable_chromium_linker_tests) { 1480 if (_enable_chromium_linker_tests) {
1481 defines += [ "ENABLE_CHROMIUM_LINKER_TESTS" ] 1481 defines += [ "ENABLE_CHROMIUM_LINKER_TESTS" ]
1482 } 1482 }
1483 } 1483 }
1484 _srcjar_deps += [ ":${_template_name}__native_libraries_java" ] 1484 _srcjar_deps += [ ":${_template_name}__native_libraries_java" ]
1485 } 1485 }
1486 1486
1487 if (!defined(invoker.apk_under_test)) {
1488 java_cpp_template("${_template_name}__multidex_config_java") {
1489 package_name = "org/chromium/base/multidex"
1490 sources = [
1491 "//base/android/java/templates/ChromiumMultiDex.template",
1492 ]
1493
1494 defines = []
1495 if (enable_multidex) {
1496 defines += [ "ENABLE_MULTIDEX" ]
1497 }
1498 }
1499 _srcjar_deps += [ ":${_template_name}__multidex_config_java" ]
1500 }
1501
1487 java_target = "${_template_name}__java" 1502 java_target = "${_template_name}__java"
1488 java_library_impl(java_target) { 1503 java_library_impl(java_target) {
1489 forward_variables_from(invoker, [ "run_findbugs" ]) 1504 forward_variables_from(invoker, [ "run_findbugs" ])
1490 supports_android = true 1505 supports_android = true
1491 requires_android = true 1506 requires_android = true
1492 override_build_config = _build_config 1507 override_build_config = _build_config
1493 deps = _android_manifest_deps + [ ":$build_config_target" ] 1508 deps = _android_manifest_deps + [ ":$build_config_target" ]
1494 1509
1495 android_manifest = _android_manifest 1510 android_manifest = _android_manifest
1496 chromium_code = true 1511 chromium_code = true
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
2257 } 2272 }
2258 2273
2259 android_library(target_name) { 2274 android_library(target_name) {
2260 java_files = [] 2275 java_files = []
2261 srcjar_deps = [ ":${_template_name}__protoc_java" ] 2276 srcjar_deps = [ ":${_template_name}__protoc_java" ]
2262 deps = [ 2277 deps = [
2263 "//third_party/android_protobuf:protobuf_nano_javalib", 2278 "//third_party/android_protobuf:protobuf_nano_javalib",
2264 ] 2279 ]
2265 } 2280 }
2266 } 2281 }
OLDNEW
« no previous file with comments | « build/android/java_cpp_template.gypi ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698