OLD | NEW |
---|---|
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 Loading... | |
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)) { | 1487 java_cpp_template("${_template_name}__chromium_build_config_java") { |
jbudorick
2016/02/10 21:45:46
Removing this condition makes me worry that we're
Peter Wen
2016/02/10 21:56:48
Makes sense. I'll check the logcat again after add
| |
1488 java_cpp_template("${_template_name}__multidex_config_java") { | 1488 package_name = "org/chromium/base" |
1489 package_name = "org/chromium/base/multidex" | 1489 sources = [ |
1490 sources = [ | 1490 "//base/android/java/templates/ChromiumBuildConfig.template", |
1491 "//base/android/java/templates/ChromiumMultiDex.template", | 1491 ] |
1492 ] | |
1493 | 1492 |
1494 defines = [] | 1493 defines = [] |
1495 if (enable_multidex) { | 1494 if (enable_multidex) { |
1496 defines += [ "ENABLE_MULTIDEX" ] | 1495 defines += [ "ENABLE_MULTIDEX" ] |
1497 } | |
1498 } | 1496 } |
1499 _srcjar_deps += [ ":${_template_name}__multidex_config_java" ] | |
1500 } | 1497 } |
1498 _srcjar_deps += [ ":${_template_name}__chromium_build_config_java" ] | |
1501 | 1499 |
1502 java_target = "${_template_name}__java" | 1500 java_target = "${_template_name}__java" |
1503 java_library_impl(java_target) { | 1501 java_library_impl(java_target) { |
1504 forward_variables_from(invoker, [ "run_findbugs" ]) | 1502 forward_variables_from(invoker, [ "run_findbugs" ]) |
1505 supports_android = true | 1503 supports_android = true |
1506 requires_android = true | 1504 requires_android = true |
1507 override_build_config = _build_config | 1505 override_build_config = _build_config |
1508 deps = _android_manifest_deps + [ ":$build_config_target" ] | 1506 deps = _android_manifest_deps + [ ":$build_config_target" ] |
1509 | 1507 |
1510 android_manifest = _android_manifest | 1508 android_manifest = _android_manifest |
(...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2276 } | 2274 } |
2277 | 2275 |
2278 android_library(target_name) { | 2276 android_library(target_name) { |
2279 java_files = [] | 2277 java_files = [] |
2280 srcjar_deps = [ ":${_template_name}__protoc_java" ] | 2278 srcjar_deps = [ ":${_template_name}__protoc_java" ] |
2281 deps = [ | 2279 deps = [ |
2282 "//third_party/android_protobuf:protobuf_nano_javalib", | 2280 "//third_party/android_protobuf:protobuf_nano_javalib", |
2283 ] | 2281 ] |
2284 } | 2282 } |
2285 } | 2283 } |
OLD | NEW |