| 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 # Do not add any imports to non-//build directories here. | 5 # Do not add any imports to non-//build directories here. | 
| 6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. | 6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. | 
| 7 import("//build_overrides/build.gni") | 7 import("//build_overrides/build.gni") | 
| 8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") | 
| 9 import("//build/config/dcheck_always_on.gni") | 9 import("//build/config/dcheck_always_on.gni") | 
| 10 import("//build/config/sanitizers/sanitizers.gni") | 10 import("//build/config/sanitizers/sanitizers.gni") | 
| (...skipping 1590 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1601           foreach(_density, _split_densities) { | 1601           foreach(_density, _split_densities) { | 
| 1602             outputs += [ "${invoker.resource_packaged_apk_path}_${_density}" ] | 1602             outputs += [ "${invoker.resource_packaged_apk_path}_${_density}" ] | 
| 1603           } | 1603           } | 
| 1604         } | 1604         } | 
| 1605         if (_split_languages != []) { | 1605         if (_split_languages != []) { | 
| 1606           args += [ "--language-splits=$_split_languages" ] | 1606           args += [ "--language-splits=$_split_languages" ] | 
| 1607           foreach(_language, _split_languages) { | 1607           foreach(_language, _split_languages) { | 
| 1608             outputs += [ "${invoker.resource_packaged_apk_path}_${_language}" ] | 1608             outputs += [ "${invoker.resource_packaged_apk_path}_${_language}" ] | 
| 1609           } | 1609           } | 
| 1610         } | 1610         } | 
|  | 1611         if (defined(invoker.aapt_locale_whitelist)) { | 
|  | 1612           args += [ "--locale-whitelist=${invoker.aapt_locale_whitelist}" ] | 
|  | 1613         } | 
| 1611         if (defined(invoker.extensions_to_not_compress)) { | 1614         if (defined(invoker.extensions_to_not_compress)) { | 
| 1612           args += [ | 1615           args += [ | 
| 1613             "--no-compress", | 1616             "--no-compress", | 
| 1614             invoker.extensions_to_not_compress, | 1617             invoker.extensions_to_not_compress, | 
| 1615           ] | 1618           ] | 
| 1616         } | 1619         } | 
| 1617       } | 1620       } | 
| 1618     } | 1621     } | 
| 1619 | 1622 | 
| 1620     _package_resources_target_name = "${target_name}__package_resources" | 1623     _package_resources_target_name = "${target_name}__package_resources" | 
| 1621     package_resources_helper(_package_resources_target_name) { | 1624     package_resources_helper(_package_resources_target_name) { | 
| 1622       forward_variables_from(invoker, | 1625       forward_variables_from(invoker, | 
| 1623                              [ | 1626                              [ | 
|  | 1627                                "aapt_locale_whitelist", | 
| 1624                                "alternative_android_sdk_jar", | 1628                                "alternative_android_sdk_jar", | 
| 1625                                "android_aapt_path", | 1629                                "android_aapt_path", | 
| 1626                                "extensions_to_not_compress", | 1630                                "extensions_to_not_compress", | 
| 1627                              ]) | 1631                              ]) | 
| 1628       deps = _deps | 1632       deps = _deps | 
| 1629       android_manifest = _android_manifest | 1633       android_manifest = _android_manifest | 
| 1630       resource_packaged_apk_path = _resource_packaged_apk_path | 1634       resource_packaged_apk_path = _resource_packaged_apk_path | 
| 1631     } | 1635     } | 
| 1632 | 1636 | 
| 1633     _generate_incremental_manifest_target_name = | 1637     _generate_incremental_manifest_target_name = | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
| 1662     } | 1666     } | 
| 1663 | 1667 | 
| 1664     _incremental_package_resources_target_name = | 1668     _incremental_package_resources_target_name = | 
| 1665         "${target_name}_incremental__package_resources" | 1669         "${target_name}_incremental__package_resources" | 
| 1666 | 1670 | 
| 1667     # TODO(agrieve): See if we can speed up this step by swapping the manifest | 1671     # TODO(agrieve): See if we can speed up this step by swapping the manifest | 
| 1668     # from the result of the main package_resources step. | 1672     # from the result of the main package_resources step. | 
| 1669     package_resources_helper(_incremental_package_resources_target_name) { | 1673     package_resources_helper(_incremental_package_resources_target_name) { | 
| 1670       forward_variables_from(invoker, | 1674       forward_variables_from(invoker, | 
| 1671                              [ | 1675                              [ | 
|  | 1676                                "aapt_locale_whitelist", | 
| 1672                                "alternative_android_sdk_jar", | 1677                                "alternative_android_sdk_jar", | 
| 1673                                "android_aapt_path", | 1678                                "android_aapt_path", | 
| 1674                                "extensions_to_not_compress", | 1679                                "extensions_to_not_compress", | 
| 1675                              ]) | 1680                              ]) | 
| 1676       deps = | 1681       deps = | 
| 1677           _incremental_deps + [ ":$_generate_incremental_manifest_target_name" ] | 1682           _incremental_deps + [ ":$_generate_incremental_manifest_target_name" ] | 
| 1678       android_manifest = _incremental_android_manifest | 1683       android_manifest = _incremental_android_manifest | 
| 1679       resource_packaged_apk_path = _incremental_resource_packaged_apk_path | 1684       resource_packaged_apk_path = _incremental_resource_packaged_apk_path | 
| 1680     } | 1685     } | 
| 1681 | 1686 | 
| (...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2820         rebase_path(root_build_dir, root_build_dir), | 2825         rebase_path(root_build_dir, root_build_dir), | 
| 2821         "--packed-libraries-dir", | 2826         "--packed-libraries-dir", | 
| 2822         rebase_path(_packed_libraries_dir, root_build_dir), | 2827         rebase_path(_packed_libraries_dir, root_build_dir), | 
| 2823         "--libraries=${invoker.libraries_filearg}", | 2828         "--libraries=${invoker.libraries_filearg}", | 
| 2824         "--filelistjson", | 2829         "--filelistjson", | 
| 2825         rebase_path(invoker.file_list_json, root_build_dir), | 2830         rebase_path(invoker.file_list_json, root_build_dir), | 
| 2826       ] | 2831       ] | 
| 2827     } | 2832     } | 
| 2828   } | 2833   } | 
| 2829 } | 2834 } | 
| OLD | NEW | 
|---|