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

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

Issue 1587673014: Revert of [Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/apk_test.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
1502 java_target = "${_template_name}__java" 1487 java_target = "${_template_name}__java"
1503 java_library_impl(java_target) { 1488 java_library_impl(java_target) {
1504 forward_variables_from(invoker, [ "run_findbugs" ]) 1489 forward_variables_from(invoker, [ "run_findbugs" ])
1505 supports_android = true 1490 supports_android = true
1506 requires_android = true 1491 requires_android = true
1507 override_build_config = _build_config 1492 override_build_config = _build_config
1508 deps = _android_manifest_deps + [ ":$build_config_target" ] 1493 deps = _android_manifest_deps + [ ":$build_config_target" ]
1509 1494
1510 android_manifest = _android_manifest 1495 android_manifest = _android_manifest
1511 chromium_code = true 1496 chromium_code = true
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
2026 java_files = [ 2011 java_files = [
2027 "//testing/android/native_test/java/src/org/chromium/native_test/NativeB rowserTestActivity.java", 2012 "//testing/android/native_test/java/src/org/chromium/native_test/NativeB rowserTestActivity.java",
2028 "//testing/android/native_test/java/src/org/chromium/native_test/NativeT estActivity.java", 2013 "//testing/android/native_test/java/src/org/chromium/native_test/NativeT estActivity.java",
2029 "//testing/android/native_test/java/src/org/chromium/native_test/NativeU nitTestActivity.java", 2014 "//testing/android/native_test/java/src/org/chromium/native_test/NativeU nitTestActivity.java",
2030 "//testing/android/native_test/java/src/org/chromium/native_test/NativeT estInstrumentationTestRunner.java", 2015 "//testing/android/native_test/java/src/org/chromium/native_test/NativeT estInstrumentationTestRunner.java",
2031 ] 2016 ]
2032 } 2017 }
2033 native_libs = [ unittests_binary ] 2018 native_libs = [ unittests_binary ]
2034 deps += [ 2019 deps += [
2035 "//base:base_java", 2020 "//base:base_java",
2021 "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
2036 "//testing/android/appurify_support:appurify_support_java", 2022 "//testing/android/appurify_support:appurify_support_java",
2037 "//testing/android/reporter:reporter_java", 2023 "//testing/android/reporter:reporter_java",
2038 ] 2024 ]
2039 data_deps += [ 2025 data_deps += [ "//tools/android/md5sum" ]
2040 "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
2041 "//tools/android/md5sum",
2042 ]
2043 if (host_os == "linux") { 2026 if (host_os == "linux") {
2044 data_deps += [ "//tools/android/forwarder2" ] 2027 data_deps += [ "//tools/android/forwarder2" ]
2045 } 2028 }
2046 } 2029 }
2047 } 2030 }
2048 2031
2049 # Generate .java files from .aidl files. 2032 # Generate .java files from .aidl files.
2050 # 2033 #
2051 # This target will store the .java files in a srcjar and should be included in 2034 # This target will store the .java files in a srcjar and should be included in
2052 # an android_library or android_apk's srcjar_deps. 2035 # an android_library or android_apk's srcjar_deps.
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
2274 } 2257 }
2275 2258
2276 android_library(target_name) { 2259 android_library(target_name) {
2277 java_files = [] 2260 java_files = []
2278 srcjar_deps = [ ":${_template_name}__protoc_java" ] 2261 srcjar_deps = [ ":${_template_name}__protoc_java" ]
2279 deps = [ 2262 deps = [
2280 "//third_party/android_protobuf:protobuf_nano_javalib", 2263 "//third_party/android_protobuf:protobuf_nano_javalib",
2281 ] 2264 ]
2282 } 2265 }
2283 } 2266 }
OLDNEW
« no previous file with comments | « build/apk_test.gypi ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698