Chromium Code Reviews| 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/toolchain/toolchain.gni") | 8 import("//build/toolchain/toolchain.gni") |
| 9 import("//third_party/android_platform/config.gni") | 9 import("//third_party/android_platform/config.gni") |
| 10 import("//tools/grit/grit_rule.gni") | 10 import("//tools/grit/grit_rule.gni") |
| (...skipping 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1098 } | 1098 } |
| 1099 | 1099 |
| 1100 # Declare an Android apk target | 1100 # Declare an Android apk target |
| 1101 # | 1101 # |
| 1102 # This target creates an Android APK containing java code, resources, assets, | 1102 # This target creates an Android APK containing java code, resources, assets, |
| 1103 # and (possibly) native libraries. | 1103 # and (possibly) native libraries. |
| 1104 # | 1104 # |
| 1105 # Variables | 1105 # Variables |
| 1106 # android_manifest: Path to AndroidManifest.xml. | 1106 # android_manifest: Path to AndroidManifest.xml. |
| 1107 # android_manifest_dep: Target that generates AndroidManifest (if applicable) | 1107 # android_manifest_dep: Target that generates AndroidManifest (if applicable) |
| 1108 # chromium_code: If true, extra analysis warning/errors will be enabled. | |
| 1108 # data_deps: List of dependencies needed at runtime. These will be built but | 1109 # data_deps: List of dependencies needed at runtime. These will be built but |
| 1109 # won't change the generated .apk in any way (in fact they may be built | 1110 # won't change the generated .apk in any way (in fact they may be built |
| 1110 # after the .apk is). | 1111 # after the .apk is). |
| 1111 # deps: List of dependencies. All Android java resources and libraries in the | 1112 # deps: List of dependencies. All Android java resources and libraries in the |
| 1112 # "transitive closure" of these dependencies will be included in the apk. | 1113 # "transitive closure" of these dependencies will be included in the apk. |
| 1113 # Note: this "transitive closure" actually only includes such targets if | 1114 # Note: this "transitive closure" actually only includes such targets if |
| 1114 # they are depended on through android_library or android_resources targets | 1115 # they are depended on through android_library or android_resources targets |
| 1115 # (and so not through builtin targets like 'action', 'group', etc). | 1116 # (and so not through builtin targets like 'action', 'group', etc). |
| 1116 # java_files: List of .java files to include in the apk. | 1117 # java_files: List of .java files to include in the apk. |
| 1117 # srcjar_deps: List of srcjar dependencies. The .java files in the srcjars | 1118 # srcjar_deps: List of srcjar dependencies. The .java files in the srcjars |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1369 if (_enable_chromium_linker_tests) { | 1370 if (_enable_chromium_linker_tests) { |
| 1370 defines += [ "ENABLE_CHROMIUM_LINKER_TESTS" ] | 1371 defines += [ "ENABLE_CHROMIUM_LINKER_TESTS" ] |
| 1371 } | 1372 } |
| 1372 } | 1373 } |
| 1373 _srcjar_deps += [ ":${_template_name}__native_libraries_java" ] | 1374 _srcjar_deps += [ ":${_template_name}__native_libraries_java" ] |
| 1374 } | 1375 } |
| 1375 | 1376 |
| 1376 java_target = "${_template_name}__java" | 1377 java_target = "${_template_name}__java" |
| 1377 java_library_impl(java_target) { | 1378 java_library_impl(java_target) { |
| 1378 forward_variables_from(invoker, [ "run_findbugs" ]) | 1379 forward_variables_from(invoker, [ "run_findbugs" ]) |
| 1380 assert(run_findbugs || true) # Mark as used. | |
|
agrieve
2015/09/28 14:52:49
I think if you move this into java_library_impl, y
| |
| 1381 | |
| 1379 supports_android = true | 1382 supports_android = true |
| 1380 requires_android = true | 1383 requires_android = true |
| 1381 override_build_config = _build_config | 1384 override_build_config = _build_config |
| 1382 deps = _android_manifest_deps + [ ":$build_config_target" ] | 1385 deps = _android_manifest_deps + [ ":$build_config_target" ] |
| 1383 | 1386 |
| 1384 android_manifest = _android_manifest | 1387 android_manifest = _android_manifest |
| 1388 assert(android_manifest != "") # Mark as used. | |
|
agrieve
2015/09/28 14:52:49
I think this should also be moved to within java_l
| |
| 1389 | |
| 1385 chromium_code = true | 1390 chromium_code = true |
| 1391 if (defined(invoker.chromium_code)) { | |
| 1392 chromium_code = invoker.chromium_code | |
| 1393 } | |
| 1394 | |
| 1386 if (defined(invoker.java_files)) { | 1395 if (defined(invoker.java_files)) { |
| 1387 java_files = invoker.java_files | 1396 java_files = invoker.java_files |
| 1388 } else if (defined(invoker.DEPRECATED_java_in_dir)) { | 1397 } else if (defined(invoker.DEPRECATED_java_in_dir)) { |
| 1389 DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir | 1398 DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir |
| 1390 } else { | 1399 } else { |
| 1391 java_files = [] | 1400 java_files = [] |
| 1392 } | 1401 } |
| 1393 srcjar_deps = _srcjar_deps | 1402 srcjar_deps = _srcjar_deps |
| 1394 jar_path = _jar_path | 1403 jar_path = _jar_path |
| 1395 dex_path = _lib_dex_path | 1404 dex_path = _lib_dex_path |
| (...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2036 | 2045 |
| 2037 # TODO(GYP): implement this. | 2046 # TODO(GYP): implement this. |
| 2038 template("uiautomator_test") { | 2047 template("uiautomator_test") { |
| 2039 set_sources_assignment_filter([]) | 2048 set_sources_assignment_filter([]) |
| 2040 forward_variables_from(invoker, [ "testonly" ]) | 2049 forward_variables_from(invoker, [ "testonly" ]) |
| 2041 assert(target_name != "") | 2050 assert(target_name != "") |
| 2042 assert(invoker.deps != [] || true) | 2051 assert(invoker.deps != [] || true) |
| 2043 group(target_name) { | 2052 group(target_name) { |
| 2044 } | 2053 } |
| 2045 } | 2054 } |
| OLD | NEW |